Fix for modular page preview #2066

getgrav · Jun 20, 2018 · 578e129 · 578e129
1 parent 7d215f9
commit 578e129
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.4.7
+## mm/dd/2018
+
+1. [](#bugfix)
+    * Fix for modular page preview [#2066](https://github.com/getgrav/grav/issues/2066)
+
 # v1.4.6
 ## 06/20/2018
 

diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php
@@ -238,7 +238,7 @@ public function processPage(Page $item, $content = null)
             // Process Modular Twig
             if ($item->modularTwig()) {
                 $twig_vars['content'] = $content;
-                $extension = $this->grav['uri']->extension();
+                $extension = $item->templateFormat('html');
                 $extension = $extension ? ".{$extension}.twig" : TEMPLATE_EXT;
                 $template = $item->template() . $extension;
                 $output = $content = $local_twig->render($template, $twig_vars);