Upgrade to 3.6.1

2021-12-07 12:39:37 +01:00
parent 9fc43ea22c
commit 70b8439c49
134 changed files with 19987 additions and 1100 deletions
--- a/kirby/src/Cms/Model.php
+++ b/kirby/src/Cms/Model.php
@@ -67,7 +67,7 @@ abstract class Model
     */
    public function kirby()
    {
-        return static::$kirby = static::$kirby ?? App::instance();
+        return static::$kirby ??= App::instance();
    }

    /**
@@ -77,7 +77,7 @@ abstract class Model
     */
    public function site()
    {
-        return $this->site = $this->site ?? $this->kirby()->site();
+        return $this->site ??= $this->kirby()->site();
    }

    /**