Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

getgrav · Dec 1, 2017 · d943c55 · d943c55
2 parents 0524bd2 + 6ae4680
commit d943c55
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php
@@ -85,9 +85,6 @@ public function init()
 
             $active_language = $language->getActive();
 
-            // Add Grav core templates location
-            $this->twig_paths[] = $locator->findResource('system://templates');
-
             // handle language templates if available
             if ($language->enabled()) {
                 $lang_templates = $locator->findResource('theme://templates/' . ($active_language ? $active_language : $language->getDefault()));
@@ -100,6 +97,9 @@ public function init()
 
             $this->grav->fireEvent('onTwigTemplatePaths');
 
+            // Add Grav core templates location
+            $this->twig_paths = array_merge($this->twig_paths, $locator->findResources('system://templates'));
+
             $this->loader = new \Twig_Loader_Filesystem($this->twig_paths);
 
             $this->grav->fireEvent('onTwigLoader');