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

getgrav · May 18, 2017 · dd23846 · dd23846
2 parents 4b14a0d + 5a93fcf
commit dd23846
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php
@@ -347,7 +347,7 @@ public function processSite($format = null, array $vars = [])
             if ($ext != '.html' . TWIG_EXT) {
                 try {
                     $page->templateFormat('html');
-                    $output = $this->twig->render($page->template() . '.html' . TWIG_EXT, $twig_vars);
+                    $output = $this->twig->render($page->template() . '.html' . TWIG_EXT, $vars + $twig_vars);
                 } catch (\Twig_Error_Loader $e) {
                     throw new \RuntimeException($error_msg, 400, $e);
                 }