When you are logged out, the URL gets lost when you log in (#13441)

It won't remember any hash as the hash won't be visible in the referrer etc but it would work for most other pages.

To make it work for hash it would get likely way more complicated like we would need to persist it through JS, temporarily store it somewhere and redirect accordingly. It fixes the case mentioned in the issue.

fix https://github.com/matomo-org/matomo/issues/13328

1 files changed, 13 insertions, 0 deletions

diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 939a160e96..2db9f15588 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -277,6 +277,19 @@ class Controller extends \Piwik\Plugin\Controller
         $this->passwordResetter->removePasswordResetInfo($login);
 
         if (empty($urlToRedirect)) {
+            $referrer = Url::getReferrer();
+            $module = Common::getRequestVar('module', '', 'string');
+            // when module is login, we redirect to home...
+            if ($module !== 'Login' && $module !== Piwik::getLoginPluginName() && $referrer) {
+                $host = Url::getHostFromUrl($referrer);
+                // we only redirect to a trusted host
+                if ($host && Url::isValidHost($host)) {
+                    $urlToRedirect = $referrer;
+                }
+            }
+        }
+
+        if (empty($urlToRedirect)) {
             $urlToRedirect = Url::getCurrentUrlWithoutQueryString();
         }