Gallery: Fix errors with missing gallery and missing gallery box sett…

…ings (#956)
IlchCMS · Apr 7, 2024 · 1126a28 · 1126a28
1 parent 5b9b613
commit 1126a28
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/application/modules/gallery/boxes/Pictureofx.php b/application/modules/gallery/boxes/Pictureofx.php
@@ -19,11 +19,11 @@ class Pictureofx extends Box
     public function render()
     {
         $imageMapper = new ImageMapper();
-        $galleries = explode(',', $this->getConfig()->get('gallery_pictureOfXSource'));
+        $galleries = explode(',', $this->getConfig()->get('gallery_pictureOfXSource') ?? '');
         $imageIds = $imageMapper->getListOfValidIds(['gallery_id' => $galleries]);
 
         if (!empty($imageIds)) {
-            $currentPicOfX = explode(',', $this->getConfig()->get('gallery_currentPicOfX'));
+            $currentPicOfX = explode(',', $this->getConfig()->get('gallery_currentPicOfX') ?? '');
 
             switch ($this->getConfig()->get('gallery_pictureOfXInterval')) {
                 case '1':
@@ -45,7 +45,7 @@ public function render()
             $currentTime = new DateTime();
             $currentIndex = (!empty($currentPicOfX[0])) ? $currentPicOfX[0] : 0;
             $setAt = (!empty($currentPicOfX[1])) ? $currentPicOfX[1] : null;
-            $date = new DateTime($setAt);
+            $date = ($setAt) ? new DateTime($setAt) : $currentTime;
 
             if (!empty($add)) {
                 $date->add(new DateInterval($add));

diff --git a/application/modules/gallery/config/config.php b/application/modules/gallery/config/config.php
@@ -14,7 +14,7 @@ class Config extends Install
 {
     public $config = [
         'key' => 'gallery',
-        'version' => '1.22.1',
+        'version' => '1.22.2',
         'icon_small' => 'fa-regular fa-image',
         'author' => 'Stantin, Thomas',
         'link' => 'https://ilch.de',

diff --git a/application/modules/gallery/controllers/admin/Index.php b/application/modules/gallery/controllers/admin/Index.php
@@ -62,7 +62,7 @@ public function indexAction()
                     }
                 }
 
-                $oldItems = $galleryMapper->getGalleryItems();
+                $oldItems = $galleryMapper->getGalleryItems() ?? [];
 
                 // Delete no longer existing items.
                 foreach ($oldItems as $oldItem) {