Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-06 12:31:53 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
Matias Griese
2017-12-01 20:40:36 +02:00
parent 0524bd2083 6ae4680fcb
commit d943c559e2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
system/src/Grav/Common/Twig/Twig.php
View File

@@ -85,9 +85,6 @@ class Twig
$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 @@ class Twig
$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');