Merge remote-tracking branch 'origin/master'

matomo-org · Feb 18, 2014 · 4cfa7d6 · 4cfa7d6
2 parents d730096 + fbf1578
commit 4cfa7d6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
@@ -41,9 +41,15 @@ public static function updateComponents(Updater $updater, $componentsWithUpdateF
         $errors   = array();
         $deactivatedPlugins = array();
         $coreError = false;
-
+        
         if (!empty($componentsWithUpdateFile)) {
-
+            $currentAccess      = Access::getInstance();
+            $hasSuperUserAccess = $currentAccess->hasSuperUserAccess();
+
+            if (!$hasSuperUserAccess) {
+                $currentAccess->setSuperUserAccess(true);
+            }
+
             // if error in any core update, show message + help message + EXIT
             // if errors in any plugins updates, show them on screen, disable plugins that errored + CONTINUE
             // if warning in any core update or in any plugins update, show message + CONTINUE
@@ -62,6 +68,10 @@ public static function updateComponents(Updater $updater, $componentsWithUpdateF
                     }
                 }
             }
+
+            if (!$hasSuperUserAccess) {
+                $currentAccess->setSuperUserAccess(false);
+            }
         }
 
         Filesystem::deleteAllCacheOnUpdate();

diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI