Merge pull request #11955 from aembler/misc-fixes-022024

Miscellaneous fixes for PHP 8 compatibility
concretecms · Feb 20, 2024 · 1e3b522 · 1e3b522
2 parents 93c9a8b + d5e459b
commit 1e3b522
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/concrete/attributes/date_time/controller.php b/concrete/attributes/date_time/controller.php
@@ -126,7 +126,11 @@ public function validateForm($data)
         if ($this->akDateDisplayMode === null) {
             $this->load();
         }
-        return $data['value'] != '';
+        if (isset($data['value']) && $data['value'] != '') {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     public function search()

diff --git a/concrete/blocks/calendar_event/controller.php b/concrete/blocks/calendar_event/controller.php
@@ -221,7 +221,7 @@ public function getOccurrence()
                 $results = $list->getResults();
             }
 
-            return $results[0];
+            return $results[0] ?? null;
         }
         if ($this->request->query->has('occurrenceID') && $this->mode == 'R') {
             // request mode

diff --git a/concrete/blocks/survey/controller.php b/concrete/blocks/survey/controller.php
@@ -34,6 +34,8 @@ class Controller extends BlockController implements UsesFeatureInterface
 
     public $customMessage;
 
+    public $cID;
+
     public $requiresRegistration = false;
     /**
      * Used for localization. If we want to localize the name/description we have to include this.

diff --git a/concrete/controllers/single_page/download_file.php b/concrete/controllers/single_page/download_file.php
@@ -147,6 +147,8 @@ public function view_inline($fID = 0)
             }
         }
 
+        $this->set('fID', $fID); // ensure $fID is set to something for invalid requests
+
         if ($this->app->make('helper/validation/numbers')->integer($fID, 1)) {
             $file = File::getByID($fID);
 
@@ -208,6 +210,8 @@ public function submit_password($fID = 0)
             }
         }
 
+        $this->set('fID', $fID); // ensure $fID is set to something for invalid requests
+
         if ($this->app->make('helper/validation/numbers')->integer($fID, 1)) {
             $f = File::getByID($fID);