Refs #3781, fixing build, revert last change and add getSuperUserLogin to Piwik_Access (so FakeAccess can mock it). Modified PDFReports to use Piwik::getSuperUserLogin instead of accessing config directly.

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 7a0b992b64..3edc46bec4 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"));
         }
     }