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

# Conflicts: # CHANGELOG.md
getgrav · Jul 5, 2018 · be661e8 · be661e8
2 parents 68a9552 + a0918df
commit be661e8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,8 +18,15 @@
     * Fixed typo in truncate function [#1943](https://github.com/getgrav/grav/issues/1943)
     * Fixed blueprint field validation: Allow numeric inputs in text fields
 
+# v1.4.7
+## mm/dd/2018
+
+1. [](#bugfix)
+    * Fix for modular page preview [#2066](https://github.com/getgrav/grav/issues/2066)
+    * `Page::routeCanonical()` should be string not array [#2069](https://github.com/getgrav/grav/issues/2069)
+
 # v1.4.6
-## 06/19/2018
+## 06/20/2018
 
 1. [](#improved)
     * Manually re-added the improved SSL off-loading that was lost with Grav v1.4.0 merge [#1888](https://github.com/getgrav/grav/pull/1888)

diff --git a/system/src/Grav/Common/Page/Media.php b/system/src/Grav/Common/Page/Media.php
@@ -88,7 +88,7 @@ protected function init()
         /** @var \DirectoryIterator $info */
         foreach ($iterator as $path => $info) {
             // Ignore folders and Markdown files.
-            if (!$info->isFile() || $info->getExtension() === 'md' || $info->getBasename()[0] === '.') {
+            if (!$info->isFile() || $info->getExtension() === 'md' || $info->getFilename()[0] === '.') {
                 continue;
             }
 

diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
@@ -1800,7 +1800,7 @@ public function routeAliases($var = null)
     public function routeCanonical($var = null)
     {
         if ($var !== null) {
-            $this->routes['canonical'] = (array)$var;
+            $this->routes['canonical'] = $var;
         }
 
         if (!empty($this->routes) && isset($this->routes['canonical'])) {

diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php
@@ -241,7 +241,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();
                 $extension = $extension ? ".{$extension}.twig" : TEMPLATE_EXT;
                 $template = $item->template() . $extension;
                 $output = $content = $local_twig->render($template, $twig_vars);