diff options
author | diosmosis <benakamoorthi@fastmail.fm> | 2014-02-25 11:44:53 +0400 |
---|---|---|
committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-02-25 11:44:53 +0400 |
commit | 15178f3be3a42fe96bda2cd1a4266dd54589069c (patch) | |
tree | ded343d858cda7c27262a117daea9d9649bfa379 /core/Db.php | |
parent | b89c1ed6215ce488a318033d3d25d4d23e64958d (diff) | |
parent | 7e037fff75362b1fa3cacecdf943b62611617c21 (diff) |
Merge branch 'master' into comparison_dashboard_changes
Conflicts:
tests/PHPUnit/UI
Diffstat (limited to 'core/Db.php')
-rw-r--r-- | core/Db.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/Db.php b/core/Db.php index 378c8dc5ef..4b4ec86cd6 100644 --- a/core/Db.php +++ b/core/Db.php @@ -53,7 +53,7 @@ class Db return self::$connection; } - public static function getDbConfig($dbConfig = null) + public static function getDatabaseConfig($dbConfig = null) { $config = Config::getInstance(); @@ -79,7 +79,7 @@ class Db * - **adapter**: either `'PDO_MYSQL'` or `'MYSQLI'` * - **type**: The MySQL engine to use, for instance 'InnoDB' */ - Piwik::postEvent('Reporting.getDatabaseConfig', array(&$dbConfig)); + Piwik::postEvent('Db.getDatabaseConfig', array(&$dbConfig)); $dbConfig['profiler'] = $config->Debug['enable_sql_profiler']; @@ -96,7 +96,7 @@ class Db */ public static function createDatabaseObject($dbConfig = null) { - $dbConfig = self::getDbConfig($dbConfig); + $dbConfig = self::getDatabaseConfig($dbConfig); $db = @Adapter::factory($dbConfig['adapter'], $dbConfig); @@ -630,4 +630,4 @@ class Db Log::debug(new Exception("Encountered deadlock: " . print_r($deadlockInfo, true))); } } -}
\ No newline at end of file +} |