Use append_url_extension from page header to set template format #2604

getgrav · Nov 10, 2018 · 9b43f20 · 9b43f20
1 parent 82d3d5e
commit 9b43f20
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
     * Allow request headers `Content-Type` to set the template type [form#221](https://github.com/getgrav/grav-plugin-form/issues/221)
 1. [](#bugfix)
     * Fixed `Uri::hasStandardPort()` to support reverse proxy configurations [#1786](https://github.com/getgrav/grav/issues/1786)
+    * Use `append_url_extension` from page header to set template format if set [#2604](https://github.com/getgrav/grav/pull/2064)
 
 # v1.6.0-beta.5
 ## 11/05/2018

diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
@@ -1287,6 +1287,10 @@ public function templateFormat($var = null)
             $this->template_format = $var;
         }
 
+        if (empty($this->template_format)) {
+            $this->template_format = $this->url_extension;
+        }
+
         if (empty($this->template_format)) {
             $content_type = Grav::instance()['uri']->getContentType(true);
             $fallback_type = Utils::getExtensionByMime($content_type);