From 31c8c117b218b5065dbd10a3e8c7c3b8bb18b16c Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Fri, 23 May 2014 00:27:08 +0200 Subject: fixed a test and cleaned up zeitgeist image directory --- core/Twig.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'core/Twig.php') diff --git a/core/Twig.php b/core/Twig.php index 8c5ce8a2ef..8dd259fc2d 100755 --- a/core/Twig.php +++ b/core/Twig.php @@ -42,18 +42,19 @@ class Twig //get current theme $manager = Plugin\Manager::getInstance(); - $theme = $manager->getThemeEnabled(); + $theme = $manager->getThemeEnabled(); $loaders = array(); //create loader for custom theme to overwrite twig templates - if($theme->getPluginName() != \Piwik\Plugin\Manager::DEFAULT_THEME){ + if($theme->getPluginName() != \Piwik\Plugin\Manager::DEFAULT_THEME) { $customLoader = $this->getCustomThemeLoader($theme); - if($customLoader){ + if ($customLoader) { //make it possible to overwrite plugin templates - $this->addCustomPluginNamespaces($customLoader,$theme->getPluginName()); + $this->addCustomPluginNamespaces($customLoader, $theme->getPluginName()); $loaders[] = $customLoader; } } + $loaders[] = $loader; $chainLoader = new Twig_Loader_Chain($loaders); -- cgit v1.2.3