redirect to referral URL on element save again + adjustment

src/controllers/ElementsController.php

@@ -364,7 +364,7 @@ public function actionEdit(?ElementInterface $element, ?int $elementId = null):
         [$docTitle, $title] = $this->_editElementTitles($element);
         $enabledForSite = $element->getEnabledForSite();
         $hasRoute = $element->getRoute() !== null;
-        $redirectUrl = $this->request->getValidatedQueryParam('returnUrl') ?? ElementHelper::postEditUrl($element);
+        $redirectUrl = $this->request->getValidatedQueryParam('returnUrl') ?? UrlHelper::cpReferralUrl() ?? ElementHelper::postEditUrl($element);
 
         // Site statuses
         if ($canEditMultipleSites) {

src/helpers/UrlHelper.php

@@ -584,8 +584,7 @@ public static function cpReferralUrl(): ?string
     {
         $referrer = Craft::$app->getRequest()->getReferrer();
 
-        // Make sure it didn't refer itself
-        if ($referrer === Craft::$app->getRequest()->getFullUri()) {
+        if ($referrer === null) {
             return null;
         }
 
@@ -594,6 +593,15 @@ public static function cpReferralUrl(): ?string
             return null;
         }
 
+        // to ensure we're comparing uris strip base cp url and query string from the referrer first
+        $referrerFullUri = ltrim(str_replace(self::baseCpUrl(), '', $referrer), '/');
+        $referrerFullUri = substr($referrerFullUri, 0, strpos($referrerFullUri, '?') ?: null);
+
+        // Make sure it didn't refer itself
+        if ($referrerFullUri === Craft::$app->getRequest()->getFullUri()) {
+            return null;
+        }
+
         return $referrer;
     }