diff options
author | Thomas Steur <thomas.steur@googlemail.com> | 2014-05-23 02:27:08 +0400 |
---|---|---|
committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-05-23 02:27:08 +0400 |
commit | 31c8c117b218b5065dbd10a3e8c7c3b8bb18b16c (patch) | |
tree | 5a0f843def4fe43c9a41e99f5a35867c3b7cf7fa /core/Twig.php | |
parent | 63b596a9044825185e0eeac1974e21dccac9967c (diff) |
fixed a test and cleaned up zeitgeist image directory
Diffstat (limited to 'core/Twig.php')
-rwxr-xr-x | core/Twig.php | 9 |
1 files changed, 5 insertions, 4 deletions
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); |