Merge branch 'develop' of github.com:CHU-TDAP/E-learning-Server-v2 into develop

This commit is contained in:
Yuan Chiu 2015-01-09 16:44:21 +08:00
commit 0fee8efd3d

View File

@ -21,13 +21,13 @@ use \PDO;
* @subpackage Database * @subpackage Database
*/ */
class MySQLDB extends PDO { class MySQLDB extends PDO {
/** /**
* 連結資料庫 * 連結資料庫
* *
* @param string $dbname 資料庫名稱 * @param string $dbname 資料庫名稱
* @param string $host 資料庫伺服器位址 * @param string $host 資料庫伺服器位址
* @param int $port 資料庫伺服器連接埠 * @param int $port 資料庫伺服器連接埠
* @param string $user 資料庫伺服器帳號 * @param string $user 資料庫伺服器帳號
* @param string $passwd 資料庫伺服器密碼 * @param string $passwd 資料庫伺服器密碼
* @author Yuan Chiu <me@yuaner.tw> * @author Yuan Chiu <me@yuaner.tw>
@ -35,13 +35,12 @@ class MySQLDB extends PDO {
*/ */
public function __construct($dbname, $host, $port, $user, $passwd){ public function __construct($dbname, $host, $port, $user, $passwd){
parent::__construct('mysql:dbname='.$dbname parent::__construct('mysql:dbname='.$dbname
.';host:'.$host.';port='.$port .';host='.$host.';port='.$port
.';charset=utf8', DB_USER, DB_PASS); .';charset=utf8', DB_USER, DB_PASS);
//配合PHP< 5.3.6 PDO沒有charset用的 //配合PHP< 5.3.6 PDO沒有charset用的
//參考: http://gdfan1114.wordpress.com/2013/06/24/php-5-3-6-%E7%89%88-pdo-%E9%85%8D%E5%90%88%E5%AD%98%E5%8F%96%E8%B3%87%E6%96%99%E5%BA%AB%E6%99%82%E7%9A%84%E4%B8%AD%E6%96%87%E5%95%8F%E9%A1%8C/ //參考: http://gdfan1114.wordpress.com/2013/06/24/php-5-3-6-%E7%89%88-pdo-%E9%85%8D%E5%90%88%E5%AD%98%E5%8F%96%E8%B3%87%E6%96%99%E5%BA%AB%E6%99%82%E7%9A%84%E4%B8%AD%E6%96%87%E5%95%8F%E9%A1%8C/
$this->exec('set names utf8'); $this->exec('set names utf8');
} }
// ======================================================================== // ========================================================================
@ -52,7 +51,7 @@ class MySQLDB extends PDO {
* *
* @access public * @access public
* @return array 錯誤訊息 * @return array 錯誤訊息
* *
* @since 2.0.0 * @since 2.0.0
* @author shuliu <https://github.com/shuliu> * @author shuliu <https://github.com/shuliu>
* @see https://github.com/shuliu/myPDO/blob/master/PDO.class.php * @see https://github.com/shuliu/myPDO/blob/master/PDO.class.php