Merge pull request #9119 from piwik/frontcontroller_tweak

Use of static local variable in FrontController hinders ability to test

1 files changed, 8 insertions, 3 deletions

diff --git a/core/FrontController.php b/core/FrontController.php
index 4b47d9024b..e276ed53e7 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -66,6 +66,11 @@ class FrontController extends Singleton
     public static $enableDispatch = true;
 
     /**
+     * @var bool
+     */
+    private $initialized = false;
+
+    /**
      * Executes the requested plugin controller method.
      *
      * @throws Exception|\Piwik\PluginDeactivatedException in case the plugin doesn't exist, the action doesn't exist,
@@ -197,11 +202,11 @@ class FrontController extends Singleton
      */
     public function init()
     {
-        static $initialized = false;
-        if ($initialized) {
+        if ($this->initialized) {
             return;
         }
-        $initialized = true;
+
+        $this->initialized = true;
 
         $tmpPath = StaticContainer::get('path.tmp');