fix: Fixed a bug where short links would not work correctly with mult…

…i-sites. ([#277](#277))
nystudio107 · Mar 14, 2023 · 1c89b9c · 1c89b9c
1 parent 6c2cf39
commit 1c89b9c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Retour Changelog
 
+## 4.1.12 - UNRELEASED
+### Fixed
+* Fixed a bug where short links would not work correctly with multi-sites. ([#277](https://github.com/nystudio107/craft-retour/issues/277))
+
 ## 4.1.11 - 2023.03.07
 ### Added
 * Added the ability to disable statistics recording entirely via `enableStatistics` in the `config.php` ([#272](https://github.com/nystudio107/craft-retour/pull/272))

diff --git a/src/controllers/TablesController.php b/src/controllers/TablesController.php
@@ -236,9 +236,11 @@ public function actionRedirects(
                 $redirect['elementTitle'] = '';
                 $redirect['elementCpUrl'] = '';
                 $elementId = $redirect['associatedElementId'] ?? null;
+                $elementSiteId = $redirect['siteId'] ?? null;
                 if (!empty($elementId)) {
-                    $element = ElementHelper::rootElement(Craft::$app->getElements()->getElementById($elementId));
+                    $element = Craft::$app->getElements()->getElementById($elementId, null, $elementSiteId);
                     if ($element) {
+                        $element = ElementHelper::rootElement($element);
                         $redirect['elementTitle'] = $element->title;
                         $redirect['elementCpUrl'] = $element->getCpEditUrl();
                     }