Fixing issues w/ merge.

core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php

@@ -78,6 +78,7 @@ class JScriptUIAssetFetcher extends UIAssetFetcher
             'plugins/Zeitgeist/javascripts/',
             'plugins/CoreHome/javascripts/uiControl.js',
             'plugins/CoreHome/javascripts/broadcast.js',
+            'plugins/CoreHome/javascripts/', // load CoreHome JS before other plugins
             'plugins/',
             'tests/',
         );

tests/PHPUnit/Fixture.php

@@ -107,7 +107,7 @@ class Fixture extends PHPUnit_Framework_Assert
             static::connectWithoutDatabase();
 
             if ($this->dropDatabaseInSetUp) {
-                DbHelper::dropDatabase();
+                $this->dropDatabase();
             }
 
             DbHelper::createDatabase($this->dbName);
@@ -193,7 +193,7 @@ class Fixture extends PHPUnit_Framework_Assert
         self::unloadAllPlugins();
 
         if ($this->dropDatabaseInTearDown) {
-            DbHelper::dropDatabase();
+            $this->dropDatabase();
         }
 
         DataTableManager::getInstance()->deleteAll();
@@ -648,4 +648,15 @@ class Fixture extends PHPUnit_Framework_Assert
         Access::getInstance();
         Piwik::postEvent('Request.initAuthenticationObject');
     }
+
+    private function dropDatabase()
+    {
+        $config = _parse_ini_file(PIWIK_INCLUDE_PATH . '/config/config.ini.php', true);
+        $originalDbName = $config['database']['dbname'];
+        if ($this->dbName == $originalDbName) { // santity check
+            throw new \Exception("Trying to drop original database $originalDbName. Something's wrong w/ the tests.");
+        }
+
+        DbHelper::dropDatabase();
+    }
 }
\ No newline at end of file