Additional check for empty template element "File content"

humhub · Oct 23, 2023 · 58d23cb · 58d23cb
1 parent 5c1eb46
commit 58d23cb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/modules/template/models/FileContent.php b/modules/template/models/FileContent.php
@@ -120,4 +120,9 @@ public function canEdit($user = null): bool
         return PagePermission::canEdit();
     }
 
-}
+    public function isEmpty(): bool
+    {
+        return !$this->hasFile();
+    }
+
+ }
diff --git a/modules/template/models/OwnerContent.php b/modules/template/models/OwnerContent.php
@@ -191,7 +191,8 @@ public function renderEmpty($options = [])
 
     public function isEmpty()
     {
-        return $this->getInstance() == null;
+        $instance = $this->getInstance();
+        return $instance === null || $instance->isEmpty();
     }
 
     public function isDefault()

diff --git a/modules/template/models/TemplateContentActiveRecord.php b/modules/template/models/TemplateContentActiveRecord.php
@@ -320,4 +320,9 @@ public function getOption($options, $key, $default = null)
         return isset($options[$key]) ? strval($options[$key]) : $default;
     }
 
+    public function isEmpty(): bool
+    {
+        return false;
+    }
+
 }