diff options
| author | Matthieu Aubry <matt@piwik.org> | 2015-02-21 00:28:48 +0300 |
|---|---|---|
| committer | Matthieu Aubry <matt@piwik.org> | 2015-02-21 00:28:48 +0300 |
| commit | c98685c365261c58df9138771f86a99b57fbaced (patch) | |
| tree | 5a41515c7bd8153d36d75c36c2680b40b81fc103 | |
| parent | 592f664c4f10a798e124ca212f428344ca0e30b7 (diff) | |
| parent | 7677d45c16033d991bc8883a0b75d1f4d4b2ec9e (diff) | |
Merge pull request #7260 from piwik/remove_config_init
Remove calls to config->init()
| -rw-r--r-- | core/AssetManager.php | 1 | ||||
| -rw-r--r-- | core/Updates.php | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/core/AssetManager.php b/core/AssetManager.php index 812a386c52..28f8407b79 100644 --- a/core/AssetManager.php +++ b/core/AssetManager.php @@ -225,7 +225,6 @@ class AssetManager extends Singleton if ($this->pluginContainsJScriptAssets($pluginName)) { - PiwikConfig::getInstance()->init(); if (Manager::getInstance()->isPluginBundledWithCore($pluginName)) { $assetsToRemove[] = $this->getMergedCoreJSAsset(); diff --git a/core/Updates.php b/core/Updates.php index b410effd21..85e7e589ab 100644 --- a/core/Updates.php +++ b/core/Updates.php @@ -56,7 +56,6 @@ abstract class Updates static function enableMaintenanceMode() { $config = Config::getInstance(); - $config->init(); $tracker = $config->Tracker; $tracker['record_statistics'] = 0; @@ -75,7 +74,6 @@ abstract class Updates static function disableMaintenanceMode() { $config = Config::getInstance(); - $config->init(); $tracker = $config->Tracker; $tracker['record_statistics'] = 1; @@ -91,7 +89,6 @@ abstract class Updates public static function deletePluginFromConfigFile($pluginToDelete) { $config = Config::getInstance(); - $config->init(); if (isset($config->Plugins['Plugins'])) { $plugins = $config->Plugins['Plugins']; if (($key = array_search($pluginToDelete, $plugins)) !== false) { |