Merge pull request #830 from hhunderter/Version-2.1.54-Beta

Version 2.1.54
IlchCMS · Oct 29, 2023 · d32882d · d32882d
2 parents b7d1c48 + 64df30c
commit d32882d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/application/modules/forum/controllers/admin/Index.php b/application/modules/forum/controllers/admin/Index.php
@@ -70,6 +70,7 @@ public function indexAction()
                         'title' => 'required',
                         'readAccess' => 'min:0',
                         'replyAccess' => 'min:0',
+                        'createAccess' => 'min:0',
                     ]);
                     if (!$validation->isValid()) {
                         $this->addMessage($validation->getErrorBag()->getErrorMessages(), 'danger', true);
@@ -83,7 +84,10 @@ public function indexAction()
 
                 // Deletes old entries from database.
                 if (!empty($oldItems)) {
-                    $forumMapper->deleteItems(array_diff($oldItems, array_keys($items)));
+                    $itemsToDelete = array_diff($oldItems, array_keys($items));
+                    if (!empty($itemsToDelete)) {
+                        $forumMapper->deleteItems($itemsToDelete);
+                    }
                 }
 
                 if ($items) {

diff --git a/application/modules/forum/mappers/Forum.php b/application/modules/forum/mappers/Forum.php
@@ -899,6 +899,10 @@ public function deleteItem(int $id)
      */
     public function deleteItems(array $ids)
     {
+        if (empty($ids)) {
+            return;
+        }
+
         $this->db()->delete('forum_items')
             ->where(['id' => $ids])
             ->execute();

diff --git a/application/modules/guestbook/config/config.php b/application/modules/guestbook/config/config.php
@@ -10,7 +10,7 @@ class Config extends \Ilch\Config\Install
 {
     public $config = [
         'key' => 'guestbook',
-        'version' => '1.13.0',
+        'version' => '1.13.1',
         'icon_small' => 'fa-solid fa-book',
         'author' => 'Stantin, Thomas',
         'link' => 'https://ilch.de',

diff --git a/application/modules/guestbook/models/Entry.php b/application/modules/guestbook/models/Entry.php
@@ -70,49 +70,49 @@ public function getId(): ?int
     /**
      * Gets the email of the entry.
      *
-     * @return string
+     * @return string|null
      */
-    public function getEmail(): string
+    public function getEmail(): ?string
     {
         return $this->email;
     }
 
     /**
      * Gets the text of the entry.
      *
-     * @return string
+     * @return string|null
      */
-    public function getText(): string
+    public function getText(): ?string
     {
         return $this->text;
     }
 
     /**
      * Gets the name of the entry.
      *
-     * @return string
+     * @return string|null
      */
-    public function getName(): string
+    public function getName(): ?string
     {
         return $this->name;
     }
 
     /**
      * Gets the homepage of the entry.
      *
-     * @return string
+     * @return string|null
      */
-    public function getHomepage(): string
+    public function getHomepage(): ?string
     {
         return $this->homepage;
     }
 
     /**
      * Gets the datetime of the entry.
      *
-     * @return string
+     * @return string|null
      */
-    public function getDatetime(): string
+    public function getDatetime(): ?string
     {
         return $this->datetime;
     }

diff --git a/index.php b/index.php
@@ -30,7 +30,7 @@
 $serverTimeZone = @date_default_timezone_get();
 date_default_timezone_set('UTC');
 
-define('VERSION', '2.1.53');
+define('VERSION', '2.1.54');
 define('SERVER_TIMEZONE', $serverTimeZone);
 define('DEFAULT_MODULE', 'page');
 define('DEFAULT_LAYOUT', 'index');