From 68e3318eb9c5d7a0d984315d202cb517a9a0e1e4 Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Wed, 12 Jun 2024 22:58:14 -0700
Subject: [PATCH] fix: fix: Fixed an issue where Short Links wouldn't work
 properly if they were added to Asset elements
 ([#300](https://github.com/nystudio107/craft-retour/issues/300))

---
 src/services/Redirects.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/services/Redirects.php b/src/services/Redirects.php
index 0ebef343..d7c4e77c 100644
--- a/src/services/Redirects.php
+++ b/src/services/Redirects.php
@@ -991,6 +991,10 @@ public function enableElementRedirect(ElementInterface $element, string $sourceU
     {
         $siteId = $element->siteId;
 
+        $destUrl = $redirectSrcMatch === 'pathonly' ? $element->uri : $element->getUrl();
+        if ($destUrl === null) {
+            $destUrl = $element->getUrl();
+        }
         $redirectConfig = [
             'redirectMatchType' => 'exactmatch',
             'redirectSrcUrl' => $sourceUrl,
@@ -998,7 +1002,7 @@ public function enableElementRedirect(ElementInterface $element, string $sourceU
             'associatedElementId' => $element->getCanonicalId(),
             'enabled' => $element->getEnabledForSite($siteId),
             'redirectSrcMatch' => $redirectSrcMatch,
-            'redirectDestUrl' => $redirectSrcMatch === 'pathonly' ? $element->uri : $element->getUrl(),
+            'redirectDestUrl' => $destUrl,
             'redirectHttpCode' => $redirectHttpCode,
         ];