Revert to loading plugin config files from the INI plugins list

matomo-org · Feb 5, 2015 · 984e5e1 · 984e5e1
1 parent c2a676f
commit 984e5e1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/core/Console.php b/core/Console.php
@@ -31,20 +31,22 @@ public function __construct()
         );
 
         $this->getDefinition()->addOption($option);
+
+        StaticContainer::setEnvironment('cli');
     }
 
     public function doRun(InputInterface $input, OutputInterface $output)
     {
+        $this->initPiwikHost($input);
+        $this->initConfig($output);
+        $this->initLoggerOutput($output);
+
         try {
             self::initPlugins();
         } catch(\Exception $e) {
             // Piwik not installed yet, no config file?
         }
 
-        $this->initPiwikHost($input);
-        $this->initConfig($output);
-        $this->initLoggerOutput($output);
-
         $commands = $this->getAvailableCommands();
 
         foreach ($commands as $command) {

diff --git a/core/Container/ContainerFactory.php b/core/Container/ContainerFactory.php
@@ -85,7 +85,7 @@ private function addEnvironmentConfig(ContainerBuilder $builder)
 
     private function addPluginConfigs(ContainerBuilder $builder)
     {
-        $plugins = Manager::getInstance()->getActivatedPlugins();
+        $plugins = Config::getInstance()->Plugins['Plugins'];
 
         foreach ($plugins as $plugin) {
             $file = Manager::getPluginsDirectory() . $plugin . '/config/config.php';

diff --git a/core/FrontController.php b/core/FrontController.php
@@ -314,9 +314,6 @@ public function init()
 
         $exceptionToThrow = self::createConfigObject();
 
-        // Load plugins before creating the container
-        Plugin\Manager::getInstance()->loadActivatedPlugins();
-
         $tmpPath = StaticContainer::get('path.tmp');
 
         $directoriesToCheck = array(
@@ -335,6 +332,7 @@ public function init()
         $this->handleSSLRedirection();
 
         Plugin\Manager::getInstance()->loadPluginTranslations();
+        Plugin\Manager::getInstance()->loadActivatedPlugins();
 
         if ($exceptionToThrow) {
             throw $exceptionToThrow;

diff --git a/misc/cron/archive.php b/misc/cron/archive.php
@@ -61,9 +61,6 @@
     $console->run();
 } else { // if running via web request, use CronArchive directly
 
-    // Load plugins before the container is created
-    Piwik\Plugin\Manager::getInstance()->loadActivatedPlugins();
-
     if (Piwik\Common::isPhpCliMode()) {
         // We can run the archive in CLI with `php-cgi` so we have to configure the container/logger
         // just like for CLI

diff --git a/misc/others/cli-script-bootstrap.php b/misc/others/cli-script-bootstrap.php
@@ -27,9 +27,6 @@
 $GLOBALS['PIWIK_TRACKER_DEBUG'] = false;
 define('PIWIK_ENABLE_DISPATCH', false);
 
-// Load plugins before the container is created
-Piwik\Plugin\Manager::getInstance()->loadActivatedPlugins();
-
 if (Piwik\Common::isPhpCliMode()) {
     StaticContainer::setEnvironment('cli');
     /** @var ConsoleHandler $consoleLogHandler */