Fixed type on template not found

getgrav · Dec 21, 2016 · 364209a · 364209a
1 parent b5be9ee
commit 364209a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.1.11
+## xx/xx/2016
+
+1. [](#improved)
+    * Fall back properly to HTML if template type not found
+
 # v1.1.10
 ## 12/21/2016
 

diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php
@@ -343,6 +343,7 @@ public function processSite($format = null)
             // Try html version of this template if initial template was NOT html
             if ($ext != '.html' . TWIG_EXT) {
                 try {
+                    $page->templateFormat('html');
                     $output = $this->twig->render($page->template() . '.html' . TWIG_EXT, $twig_vars);
                 } catch (\Twig_Error_Loader $e) {
                     throw new \RuntimeException($error_msg, 400, $e);