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/Language.php
+++ b/kirby/src/Cms/Language.php
@@ -132,6 +132,11 @@ class Language extends Model
        $kirby = App::instance();
        $site  = $kirby->site();

+        // convert site
+        foreach ($site->files() as $file) {
+            F::move($file->contentFile($from, true), $file->contentFile($to, true));
+        }
+
        F::move($site->contentFile($from, true), $site->contentFile($to, true));

        // convert all pages
@@ -489,7 +494,7 @@ class Language extends Model
     */
    public function url(): string
    {
-        return Url::to($this->pattern());
+        return Url::makeAbsolute($this->pattern(), $this->kirby()->url());
    }

    /**