Merge pull request #1412 from medeopolis/batchEditor_TaskQueue

PHP8 Compatibility
collectiveaccess · Apr 6, 2023 · 885a883 · 885a883
2 parents 4290380 + a9159da
commit 885a883
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/app/lib/BaseFindController.php b/app/lib/BaseFindController.php
@@ -195,7 +195,11 @@ public function Index($pa_options=null) {
 			$vs_label_display_field = $t_label->getDisplayField();
 			foreach($display_list as $i => $va_display_item) {
 				$tmp = explode('.', $va_display_item['bundle_name']);
-
+
+				if(!isset($tmp[1])){ 
+					$tmp[1] = null;
+				}
+
 				if (
 					(($tmp[0] === $vs_label_table_name) && ($tmp[1] === $vs_label_display_field))
 					||

diff --git a/app/lib/Plugins/TaskQueueHandlers/batchEditor.php b/app/lib/Plugins/TaskQueueHandlers/batchEditor.php
@@ -61,7 +61,7 @@ public function getParametersForDisplay($rec) {
 
 		$params = [];
 
-		$t_set = new ca_sets($parameters['set_id']);
+		$t_set = new ca_sets($parameters['set_id'] ?? null);
 		$params['importing_from'] = array(
 			'label' => _t("Applying batch edits to set"),
 			'value' => $t_set->getLabelForDisplay()

diff --git a/app/models/ca_bundle_displays.php b/app/models/ca_bundle_displays.php
@@ -2918,7 +2918,11 @@ public function getDisplayListForResultsEditor(string $table, $options=null) {
 			$label_display_field = $t_label ? $t_label->getDisplayField() : null;
 			foreach($display_list as $i => $display_item) {
 				$tmp = explode('.', $display_item['bundle_name']);
-
+
+				if(!isset($tmp[1])){
+					$tmp[1] = null;
+				}
+
 				if (
 					(($tmp[0] === $label_table_name) && ($tmp[1] === $label_display_field))
 					||