diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-04-08 09:37:34 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-04-08 09:37:34 +0400 |
commit | 2af5132bb1c50ab5df2b7e8462b4d5f47b53adfb (patch) | |
tree | ad44f0b934ac30e4a0f607c08bbbf04db96d6317 /plugins | |
parent | 575f1af34d0e3335ba32b085fc5fcf8735ee60ce (diff) | |
parent | 24c2aa796cfd7101926be5de5d6d7dafcb9e4145 (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/PDFReports/API.php | 2 | ||||
-rw-r--r-- | plugins/PDFReports/PDFReports.php | 2 | ||||
-rw-r--r-- | plugins/UsersManager/API.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/plugins/PDFReports/API.php b/plugins/PDFReports/API.php index 373b19fe0f..b57c05d5dc 100644 --- a/plugins/PDFReports/API.php +++ b/plugins/PDFReports/API.php @@ -351,7 +351,7 @@ class Piwik_PDFReports_API // is enforced in Scheduled tasks, and ensure Multisites.getAll only return the websites that this user can access $userLogin = $report['login']; if (!empty($userLogin) - && $userLogin != Piwik_Config::getInstance()->superuser['login'] + && $userLogin != Piwik::getSuperUserLogin() ) { $_GET['_restrictSitesToLogin'] = $userLogin; } diff --git a/plugins/PDFReports/PDFReports.php b/plugins/PDFReports/PDFReports.php index 5f295b8366..6a0ead9469 100644 --- a/plugins/PDFReports/PDFReports.php +++ b/plugins/PDFReports/PDFReports.php @@ -371,7 +371,7 @@ class Piwik_PDFReports extends Piwik_Plugin if ($reportParameters[self::EMAIL_ME_PARAMETER] == 1) { if (Piwik::getCurrentUserLogin() == $report['login']) { $emails[] = Piwik::getCurrentUserEmail(); - } elseif ($report['login'] == Piwik_Config::getInstance()->superuser['login']) { + } elseif ($report['login'] == Piwik::getSuperUserLogin()) { $emails[] = Piwik::getSuperUserEmail(); } else { try { diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php index 60d13ea6c1..7937c90ec4 100644 --- a/plugins/UsersManager/API.php +++ b/plugins/UsersManager/API.php @@ -601,7 +601,7 @@ class Piwik_UsersManager_API private function checkUserIsNotSuperUser($userLogin) { - if ($userLogin == Piwik_Config::getInstance()->superuser['login']) { + if ($userLogin == Piwik::getSuperUserLogin()) { throw new Exception(Piwik_TranslateException("UsersManager_ExceptionSuperUser")); } } |