Restore the speed of Visitor Log (#12009)

* render template only if needed

* reuse same Twig instance

* cache CacheBuster to prevent recalculation when needed multiple times

2 files changed, 29 insertions, 12 deletions

diff --git a/core/AssetManager/UIAssetCacheBuster.php b/core/AssetManager/UIAssetCacheBuster.php
index fcbd0720a9..15b55943b9 100644
--- a/core/AssetManager/UIAssetCacheBuster.php
+++ b/core/AssetManager/UIAssetCacheBuster.php
@@ -27,20 +27,32 @@ class UIAssetCacheBuster extends Singleton
      */
     public function piwikVersionBasedCacheBuster($pluginNames = false)
     {
-        $masterFile = PIWIK_INCLUDE_PATH . '/.git/refs/heads/master';
-        $currentGitHash = file_exists($masterFile) ? @file_get_contents($masterFile) : null;
+        static $cachedCacheBuster = null;
 
-        $pluginNames = !$pluginNames ? Manager::getInstance()->getLoadedPluginsName() : $pluginNames;
-        sort($pluginNames);
+        if (empty($cachedCacheBuster) || $pluginNames !== false) {
 
-        $pluginsInfo = '';
-        foreach ($pluginNames as $pluginName) {
-            $plugin       = Manager::getInstance()->getLoadedPlugin($pluginName);
-            $pluginsInfo .= $plugin->getPluginName() . $plugin->getVersion() . ',';
+            $masterFile     = PIWIK_INCLUDE_PATH . '/.git/refs/heads/master';
+            $currentGitHash = file_exists($masterFile) ? @file_get_contents($masterFile) : null;
+
+            $plugins = !$pluginNames ? Manager::getInstance()->getLoadedPluginsName() : $pluginNames;
+            sort($plugins);
+
+            $pluginsInfo = '';
+            foreach ($plugins as $pluginName) {
+                $plugin      = Manager::getInstance()->getLoadedPlugin($pluginName);
+                $pluginsInfo .= $plugin->getPluginName() . $plugin->getVersion() . ',';
+            }
+
+            $cacheBuster = md5($pluginsInfo . PHP_VERSION . Version::VERSION . trim($currentGitHash));
+
+            if ($pluginNames !== false) {
+                return $cacheBuster;
+            }
+
+            $cachedCacheBuster = $cacheBuster;
         }
 
-        $cacheBuster = md5($pluginsInfo . PHP_VERSION . Version::VERSION . trim($currentGitHash));
-        return $cacheBuster;
+        return $cachedCacheBuster;
     }
 
     /**
diff --git a/core/View.php b/core/View.php
index e74eae6201..3c90b5f9a7 100644
--- a/core/View.php
+++ b/core/View.php
@@ -212,10 +212,15 @@ class View implements ViewInterface
         return isset($this->templateVars[$name]);
     }
 
+    /** @var Twig */
+    static $twigCached = null;
+
     private function initializeTwig()
     {
-        $piwikTwig = new Twig();
-        $this->twig = $piwikTwig->getTwigEnvironment();
+        if (empty(static::$twigCached)) {
+            static::$twigCached = new Twig();
+        }
+        $this->twig = static::$twigCached->getTwigEnvironment();
     }
 
     /**