Upgrade to 3.2.3

2019-08-06 10:24:12 +02:00
parent 40f095f5de
commit 02be32bb75
48 changed files with 356 additions and 114 deletions
--- a/kirby/src/Cms/ModelWithContent.php
+++ b/kirby/src/Cms/ModelWithContent.php
@@ -260,11 +260,18 @@ abstract class ModelWithContent extends Model
    /**
     * Returns the lock object for this model
     *
-     * @return Kirby\Cms\ContentLock
+     * Only if a content directory exists,
+     * virtual pages will need to overwrite this method
+     *
+     * @return Kirby\Cms\ContentLock|null
     */
    public function lock()
    {
-        return new ContentLock($this);
+        $dir = $this->contentFileDirectory();
+
+        if (is_string($dir) === true && file_exists($dir) === true) {
+            return new ContentLock($this);
+        }
    }

    /**