Merge from piwik master

1 files changed, 9 insertions, 0 deletions

diff --git a/core/Twig.php b/core/Twig.php
index f8325a1ce5..4b32e4931c 100644
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -73,6 +73,15 @@ class Twig
         $this->addFunction_loadJavascriptTranslations();
         $this->addFunction_sparkline();
         $this->addFunction_postEvent();
+        $this->addFunction_isPluginLoaded();
+    }
+
+    protected function addFunction_isPluginLoaded()
+    {
+        $isPluginLoadedFunction = new Twig_SimpleFunction('isPluginLoaded', function ($pluginName) {
+            return PluginsManager::getInstance()->isPluginLoaded($pluginName);
+        });
+        $this->twig->addFunction($isPluginLoadedFunction);
     }
 
     protected function addFunction_includeAssets()