Upgrade to 3.5.5

2021-05-11 11:55:32 +02:00
parent de3560f3d6
commit efeff45192
146 changed files with 2008 additions and 1075 deletions
--- a/kirby/src/Cms/Translation.php
+++ b/kirby/src/Cms/Translation.php
@@ -139,15 +139,17 @@ class Translation
     * @param string $code
     * @param string $root
     * @param array $inject
-     * @return self
+     * @return static
     */
    public static function load(string $code, string $root, array $inject = [])
    {
        try {
-            return new Translation($code, array_merge(Data::read($root), $inject));
+            $data = array_merge(Data::read($root), $inject);
        } catch (Exception $e) {
-            return new Translation($code, []);
+            $data = [];
        }
+
+        return new static($code, $data);
    }

    /**