5 files changed, 31 insertions, 9 deletions
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index 4beee901c2..a85784f6d4 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -203,7 +203,7 @@ class Manager extends Singleton
     /**
      * Update Plugins config
      *
-     * @param array $plugins Plugins
+     * @param array $pluginsToLoad Plugins
      */
     private function updatePluginsConfig($pluginsToLoad)
     {
@@ -1405,6 +1405,9 @@ class Manager extends Singleton
     private function sortPluginsSameOrderAsGlobalConfig(array $plugins)
     {
         $global = $this->getPluginsFromGlobalIniConfigFile();
+        if(empty($global)) {
+            return $plugins;
+        }
         $global = array_values($global);
         $plugins = array_values($plugins);
 
diff --git a/core/Updates/2.10.0-b7.php b/core/Updates/2.10.0-b7.php
index 21a5e7b1af..a44117fc81 100644
--- a/core/Updates/2.10.0-b7.php
+++ b/core/Updates/2.10.0-b7.php
@@ -38,13 +38,6 @@ class Updates_2_10_0_b7 extends Updates
     static function update()
     {
         Updater::updateDatabase(__FILE__, self::getSql());
-
-        $pluginManager = \Piwik\Plugin\Manager::getInstance();
-
-        try {
-            $pluginManager->activatePlugin('Resolution');
-        } catch(\Exception $e) {
-        }
     }
 
 }
diff --git a/core/Updates/2.10.0-b8.php b/core/Updates/2.10.0-b8.php
new file mode 100644
index 0000000000..17705f8143
--- /dev/null
+++ b/core/Updates/2.10.0-b8.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Updates;
+
+use Piwik\Updates;
+
+class Updates_2_10_0_b8 extends Updates
+{
+    static function update()
+    {
+        $pluginManager = \Piwik\Plugin\Manager::getInstance();
+
+        try {
+            $pluginManager->activatePlugin('Resolution');
+        } catch(\Exception $e) {
+        }
+    }
+
+}
diff --git a/core/Version.php b/core/Version.php
index 7b382341ef..6708ff9f70 100644
--- a/core/Version.php
+++ b/core/Version.php
@@ -20,5 +20,5 @@ final class Version
      * The current Piwik version.
      * @var string
      */
-    const VERSION = '2.10.0-b7';
+    const VERSION = '2.10.0-b8';
 }
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
-Subproject 4cdf80fc99025b71e5d8e59419d2af749e466df
+Subproject 87fee9b1024b1c03d5d5d66a4fb4f699231e8e5