diff options
author | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-03-10 05:45:55 +0300 |
---|---|---|
committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-03-10 05:59:47 +0300 |
commit | b2800772d53741fc14cb51d8cbe619734e8f873e (patch) | |
tree | 39cd1b2dd2242ce58cce4eedd988d4a9daedbd21 | |
parent | 87577b6d8d1b3e1ca083f0a5d895a5643fd88339 (diff) |
Remove deprecated Config::getConfigSuperUserForBackwardCompatibility()
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | core/Config.php | 27 |
2 files changed, 2 insertions, 26 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d252e23600..b6f7bc8f89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API' ### Breaking Changes * The deprecated method `Period::factory()` has been removed. Use `Period\Factory` instead. +* The deprecated method `Config::getConfigSuperUserForBackwardCompatibility()` has been removed. ## Piwik 2.11.0 diff --git a/core/Config.php b/core/Config.php index 014424c119..e28f581ea8 100644 --- a/core/Config.php +++ b/core/Config.php @@ -455,10 +455,7 @@ class Config extends Singleton : $this->configLocal[$name]; } - if ($section === null && $name == 'superuser') { - $user = $this->getConfigSuperUserForBackwardCompatibility(); - return $user; - } else if ($section === null) { + if ($section === null) { $section = array(); } @@ -469,28 +466,6 @@ class Config extends Singleton return $tmp; } - /** - * @deprecated since version 2.0.4 - */ - public function getConfigSuperUserForBackwardCompatibility() - { - try { - $db = Db::get(); - $user = $db->fetchRow("SELECT login, email, password - FROM " . Common::prefixTable("user") . " - WHERE superuser_access = 1 - ORDER BY date_registered ASC LIMIT 1"); - - if (!empty($user)) { - $user['bridge'] = 1; - return $user; - } - - } catch (Exception $e) {} - - return array(); - } - public function getFromGlobalConfig($name) { if (isset($this->configGlobal[$name])) { |