Move the Super User auth check within the helper SettingsServer::isArchivePhpTriggered()

1 files changed, 3 insertions, 4 deletions

diff --git a/core/SettingsServer.php b/core/SettingsServer.php
index 15f180025f..d1d5142ec7 100644
--- a/core/SettingsServer.php
+++ b/core/SettingsServer.php
@@ -27,7 +27,8 @@ class SettingsServer
     public static function isArchivePhpTriggered()
     {
         return !empty($_GET['trigger'])
-        && $_GET['trigger'] == 'archivephp';
+                && $_GET['trigger'] == 'archivephp'
+                && Piwik::hasUserSuperUserAccess();
     }
 
     /**
@@ -120,9 +121,7 @@ class SettingsServer
         }
         $minimumMemoryLimit = Config::getInstance()->General['minimum_memory_limit'];
 
-        if (self::isArchivePhpTriggered()
-            && Piwik::hasUserSuperUserAccess()
-        ) {
+        if (self::isArchivePhpTriggered()) {
             // archive.php: no time limit, high memory limit
             self::setMaxExecutionTime(0);
             $minimumMemoryLimitWhenArchiving = Config::getInstance()->General['minimum_memory_limit_when_archiving'];