From 7677d45c16033d991bc8883a0b75d1f4d4b2ec9e Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Sat, 21 Feb 2015 09:54:37 +1300
Subject: [PATCH] Remove calls to config->init()
---
core/AssetManager.php | 1 -
core/Updates.php | 3 ---
2 files changed, 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) {
--
GitLab