Merge remote-tracking branch 'origin/master'

2 files changed, 12 insertions, 2 deletions

diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
index c11e83d070..3404dc0bfe 100644
--- a/plugins/CoreUpdater/CoreUpdater.php
+++ b/plugins/CoreUpdater/CoreUpdater.php
@@ -41,9 +41,15 @@ class CoreUpdater extends \Piwik\Plugin
         $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 @@ class CoreUpdater extends \Piwik\Plugin
                     }
                 }
             }
+            
+            if (!$hasSuperUserAccess) {
+                $currentAccess->setSuperUserAccess(false);
+            }
         }
 
         Filesystem::deleteAllCacheOnUpdate();
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
-Subproject 38d0e627a91b1625d33575ec9f712a19c529410
+Subproject 9531b019cbcaedc1bbf613d14032e7bd0b839ff