Prevent exception when redirect has no site

riasvdv · Jan 16, 2024 · 5799203 · 5799203
1 parent cc20c33
commit 5799203
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Exporters/CsvExporter.php b/src/Exporters/CsvExporter.php
@@ -58,7 +58,9 @@ private function insertData()
     {
         $data = Redirect::all()->map(function (\Rias\StatamicRedirect\Data\Redirect $redirect) {
             $redirectData = $redirect->fileData();
-            $redirectData['site'] = $redirect->site()->handle;
+            $redirectData['site'] = $redirect->site()
+                ? $redirect->site()->handle
+                : null;
 
             unset($redirectData['id']);
 

diff --git a/src/Exporters/JsonExporter.php b/src/Exporters/JsonExporter.php
@@ -16,9 +16,11 @@ class JsonExporter extends Exporter
      */
     public function export(): string
     {
-        $submissions = Redirect::all()->map(function (Redirect $redirect) {
+        $submissions = Redirect::all()->map(function (\Rias\StatamicRedirect\Data\Redirect $redirect) {
             $redirectData = $redirect->fileData();
-            $redirectData['site'] = $redirect->site()->handle;
+            $redirectData['site'] = $redirect->site()
+                ? $redirect->site()->handle
+                : null;
 
             unset($redirectData['id']);