diff options
| -rw-r--r-- | config/global.ini.php | 4 | ||||
| -rw-r--r-- | core/Db.php | 2 | ||||
| -rw-r--r-- | core/Db/BatchInsert.php | 2 | ||||
| -rw-r--r-- | core/Db/Schema.php | 2 | ||||
| -rw-r--r-- | core/Tracker.php | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index 35cfbd3de8..b5903e270c 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -18,7 +18,7 @@ password = dbname = tables_prefix = port = 3306 -adapter = PDO_MYSQL +adapter = PDO\MYSQL type = InnoDB schema = Mysql @@ -34,7 +34,7 @@ password = dbname = piwik_tests tables_prefix = piwiktests_ port = 3306 -adapter = PDO_MYSQL +adapter = PDO\MYSQL type = InnoDB schema = Mysql diff --git a/core/Db.php b/core/Db.php index 0bcfd68f47..826a4afa12 100644 --- a/core/Db.php +++ b/core/Db.php @@ -76,7 +76,7 @@ class Db * database. * - **dbname**: The name of the Piwik MySQL database. * - **port**: The MySQL database port to use. - * - **adapter**: either `'PDO_MYSQL'` or `'MYSQLI'` + * - **adapter**: either `'PDO\MYSQL'` or `'MYSQLI'` * - **type**: The MySQL engine to use, for instance 'InnoDB' */ Piwik::postEvent('Db.getDatabaseConfig', array(&$dbConfig)); diff --git a/core/Db/BatchInsert.php b/core/Db/BatchInsert.php index f8325c0209..c3476438cf 100644 --- a/core/Db/BatchInsert.php +++ b/core/Db/BatchInsert.php @@ -168,7 +168,7 @@ class BatchInsert /* * Second attempt: using the LOCAL keyword means the client reads the file and sends it to the server; - * the LOCAL keyword may trigger a known PHP PDO_MYSQL bug when MySQL not built with --enable-local-infile + * the LOCAL keyword may trigger a known PHP PDO\MYSQL bug when MySQL not built with --enable-local-infile * @see http://bugs.php.net/bug.php?id=54158 */ $openBaseDir = ini_get('open_basedir'); diff --git a/core/Db/Schema.php b/core/Db/Schema.php index 834dfdda36..fd4f26da33 100644 --- a/core/Db/Schema.php +++ b/core/Db/Schema.php @@ -77,7 +77,7 @@ class Schema extends Singleton $adapterName = strtoupper($adapterName); switch ($adapterName) { - case 'PDO_MYSQL': + case 'PDO\MYSQL': case 'MYSQLI': $adapterName = 'MYSQL'; break; diff --git a/core/Tracker.php b/core/Tracker.php index fed184a51e..131988c02b 100644 --- a/core/Tracker.php +++ b/core/Tracker.php @@ -556,7 +556,7 @@ class Tracker * database. * - **dbname**: The name of the Piwik MySQL database. * - **port**: The MySQL database port to use. - * - **adapter**: either `'PDO_MYSQL'` or `'MYSQLI'` + * - **adapter**: either `'PDO\MYSQL'` or `'MYSQLI'` * - **type**: The MySQL engine to use, for instance 'InnoDB' */ Piwik::postEvent('Tracker.getDatabaseConfig', array(&$configDb)); |