Merge pull request #51 from venveo/develop-v3

Fix php warning from elements without URIs
venveo · Jul 14, 2022 · 73c44bc · 73c44bc
2 parents 566f9ad + 44083a9
commit 73c44bc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Redirect Changelog
 
+## 3.0.12 - 2022-07-14
+
+### Fixed
+- Fix warning generated by attempting to auto-create redirects on elements without URIs
+
 ## 3.0.11 - 2022-06-21
 
 ### Fixed

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "venveo/craft-redirect",
     "description": "Craft redirect plugin provides an easy way to enter and maintain 301 and 302 redirects and 404 error pages.",
     "type": "craft-plugin",
-    "version": "3.0.11",
+    "version": "3.0.12",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/services/Redirects.php b/src/services/Redirects.php
@@ -190,7 +190,7 @@ public function handleBeforeElementSaved(ElementEvent $e): void
             static::$elementUrisChanging[$siteId] = [];
         }
         // Grab the current URI from the database and store it
-        $oldUri = Craft::$app->elements->getElementById($elementId, null, $siteId)->uri;
+        $oldUri = Craft::$app->elements->getElementById($elementId, null, $siteId)->uri ?? null;
         if ($oldUri) {
             static::$elementUrisChanging[$siteId][$elementId] = $oldUri;
         }
@@ -209,7 +209,7 @@ public function handleAfterElementSaved(ElementEvent $e): void
             $siteId = $savedElement->siteId;
             $elementId = $savedElement->id;
             $oldUri = static::$elementUrisChanging[$siteId][$elementId] ?? null;
-            $newUri = $savedElement->uri;
+            $newUri = $savedElement->uri ?? null;
             // If there were no URI changes, let's bail
             if (!$oldUri || !$newUri || $oldUri === $newUri) {
                 return;