Remove update warnings

Kuestenschmiede · Apr 2, 2024 · 48de55c · 48de55c
1 parent 5646600
commit 48de55c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Classes/C4GImport.php b/src/Classes/C4GImport.php
@@ -1229,7 +1229,7 @@ private function getSqlFromJson($file, $uuid, $importDataType, $imagePath): arra
                             $updateWhereQueryValue = $importDbValue;
                         } elseif ($queryType == 'UPDATE' && $importDbField == 'path' && $importDB == 'tl_files') {
                             $updateWhereQueryValue = $importDbValue;
-                        } elseif ($updateWhereQuery && $importDbField && $updateWhereQuery == ' WHERE id=' && $importDbField == 'id') {
+                        } elseif (isset($updateWhereQuery) && $updateWhereQuery && $importDbField && $updateWhereQuery == ' WHERE id=' && $importDbField == 'id') {
                             $updateWhereQueryValue = $allIdChanges[$importDB]['id'][$importDataset['id']];
                         }
 

diff --git a/src/Classes/Callback/C4GImportDataCallback.php b/src/Classes/Callback/C4GImportDataCallback.php
@@ -348,7 +348,11 @@ public function updateBaseData($importId = false)
 
         $this->importBaseData($importId);
 
-        PageRedirect::redirect('/contao?do=c4g_io_data');
+        try {
+            PageRedirect::redirect('/contao?do=c4g_io_data');
+        } catch (Exception $e) {
+            //do nothing - cron error
+        }
     }
 
     /**
@@ -1008,7 +1012,7 @@ private function getSqlFromJson($relations,$relationTables,$relationTablesPrimar
                         $updateWhereQueryValue = $importDbValue;
                     } elseif ($queryType == 'UPDATE' && $importDbField == 'path' && $importDB == 'tl_files') {
                         $updateWhereQueryValue = $importDbValue;
-                    } elseif ($updateWhereQuery == ' WHERE id=' && $importDbField == 'id') {
+                    } elseif (isset($updateWhereQuery) && $updateWhereQuery == ' WHERE id=' && $importDbField == 'id') {
                         $updateWhereQueryValue = $allIdChanges[$importDB]['id'][$importDataset['id']];
                     }