Upgrade to 3.1.4

2019-05-21 12:16:05 +02:00
parent 066913cb6e
commit 9e18cf635d
42 changed files with 215 additions and 109 deletions
--- a/kirby/src/Cms/Page.php
+++ b/kirby/src/Cms/Page.php
@@ -247,9 +247,13 @@ class Page extends ModelWithContent
        }

        $blueprints      = [];
-        $templates       = $this->blueprint()->options()['changeTemplate'] ?? false;
+        $templates       = $this->blueprint()->options()['changeTemplate'] ?? [];
        $currentTemplate = $this->intendedTemplate()->name();

+        if (is_array($templates) === false) {
+            $templates = [];
+        }
+
        // add the current template to the array
        $templates[] = $currentTemplate;