Upgrade to 3.1.0

2019-03-19 11:07:14 +01:00
parent 418db4b09b
commit 6e074142f1
98 changed files with 1266 additions and 299 deletions
--- a/kirby/src/Cms/ContentTranslation.php
+++ b/kirby/src/Cms/ContentTranslation.php
@@ -87,7 +87,12 @@ class ContentTranslation

        // merge with the default content
        if ($this->isDefault() === false && $defaultLanguage = $parent->kirby()->defaultLanguage()) {
-            $default = $parent->translation($defaultLanguage->code())->content();
+            $default = [];
+
+            if ($defaultTranslation = $parent->translation($defaultLanguage->code())) {
+                $default = $defaultTranslation->content();
+            }
+
            $content = array_merge($default, $content);
        }