Merge pull request #1374 from tripal/1373-tv3-php8-fixes

Issue 1373 PHP8 fixes
tripal · Jan 7, 2023 · cfc874d · cfc874d
2 parents 98b6160 + a19eb50
commit cfc874d
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/tripal_bulk_loader/includes/tripal_bulk_loader.loader.inc b/tripal_bulk_loader/includes/tripal_bulk_loader.loader.inc
@@ -209,12 +209,12 @@ function tripal_bulk_loader_load_data($nid, $job_id) {
     foreach ($record_array['fields'] as $field_index => $field_array) {
 
       $default_data[$priority]['table'] = $record_array['table'];
-      $default_data[$priority]['mode'] = ($record_array['mode']) ? $record_array['mode'] : 'insert';
-      $default_data[$priority]['select_if_duplicate'] = ($record_array['select_if_duplicate']) ? $record_array['select_if_duplicate'] : 0;
-      $default_data[$priority]['update_if_duplicate'] = ($record_array['update_if_duplicate']) ? $record_array['update_if_duplicate'] : 0;
-      $default_data[$priority]['disabled'] = ($record_array['disable']) ? $record_array['disable'] : 0;
-      $default_data[$priority]['optional'] = ($record_array['optional']) ? $record_array['optional'] : 0;
-      $default_data[$priority]['select_optional'] = ($record_array['select_optional']) ? $record_array['select_optional'] : 0;
+      $default_data[$priority]['mode'] = array_key_exists('mode', $record_array) ? $record_array['mode'] : 'insert';
+      $default_data[$priority]['select_if_duplicate'] = array_key_exists('select_if_duplicate', $record_array) ? $record_array['select_if_duplicate'] : 0;
+      $default_data[$priority]['update_if_duplicate'] = array_key_exists('update_if_duplicate', $record_array) ? $record_array['update_if_duplicate'] : 0;
+      $default_data[$priority]['disabled'] = array_key_exists('disable', $record_array) ? $record_array['disable'] : 0;
+      $default_data[$priority]['optional'] = array_key_exists('optional', $record_array) ? $record_array['optional'] : 0;
+      $default_data[$priority]['select_optional'] = array_key_exists('select_optional', $record_array) ? $record_array['select_optional'] : 0;
       $default_data[$priority]['record_id'] = $record_array['record_id'];
       $default_data[$priority]['required'][$field_array['field']] = $field_array['required'];
 
@@ -896,10 +896,10 @@ function tripal_bulk_loader_add_spreadsheetdata_to_values($values, $line, $field
       continue;
     }
 
-    $column = $field2column[$field] - 1;
-    if ($column < 0) {
+    if (empty($field2column[$field])) {
       continue;
     }
+    $column = $field2column[$field] - 1;
 
     if (preg_match('/\S+/', $line[$column])) {
       $values[$field] = $line[$column];