diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index 1e440de915b5aca0623b9bf2ce4ed0ceef170320..9ed0e7c3cf48a528f4ec6f80e6246a045a5e3a6e 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -332,10 +332,12 @@ class Controller extends \Piwik\Controller if (is_null($errorMessage)) // if success, show login w/ success message { - return $this->redirectToIndex('Login', 'resetPasswordSuccess'); + $this->redirectToIndex('Login', 'resetPasswordSuccess'); + return; } else { // show login page w/ error. this will keep the token in the URL - return $this->login($errorMessage); + $this->login($errorMessage); + return; } } @@ -375,7 +377,7 @@ class Controller extends \Piwik\Controller */ public function resetPasswordSuccess() { - return $this->login($errorMessage = null, $infoMessage = Piwik_Translate('Login_PasswordChanged')); + $this->login($errorMessage = null, $infoMessage = Piwik_Translate('Login_PasswordChanged')); } /** diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php index 8bf89fa47946b9d6a665d5b4cd6845f1822d2ea2..78d8bc2e9d5752bd0c1965019474a5cb5eca89df 100644 --- a/plugins/PrivacyManager/Controller.php +++ b/plugins/PrivacyManager/Controller.php @@ -56,7 +56,7 @@ class Controller extends \Piwik\Controller\Admin } } - return $this->redirectToIndex('PrivacyManager', 'privacySettings', null, null, null, array('updated' => 1)); + $this->redirectToIndex('PrivacyManager', 'privacySettings', null, null, null, array('updated' => 1)); } /** @@ -149,7 +149,8 @@ class Controller extends \Piwik\Controller\Admin if ($_SERVER["REQUEST_METHOD"] != "POST" && !Common::isPhpCliMode() ) { - return $this->redirectToIndex('PrivacyManager', 'privacySettings'); + $this->redirectToIndex('PrivacyManager', 'privacySettings'); + return; } $settings = PrivacyManager::getPurgeDataSettings();