Fixing the redirects

burzum · Oct 1, 2015 · 38e0e72 · 38e0e72
1 parent 3539dc8
commit 38e0e72
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Controller/Component/UserToolComponent.php b/src/Controller/Component/UserToolComponent.php
@@ -373,8 +373,8 @@ public function mapAction() {
 	public function _handleUserBeingAlreadyLoggedIn(array $options) {
 		$Auth = $this->_getAuthObject();
 		if ((bool)$Auth->user()) {
-			if ($options['alreadyLoggedInFlashOptions'] === null) {
-				$options['alreadyLoggedInRedirectUrl'] = $Auth->redirectUrl();
+			if ($options['alreadyLoggedInRedirectUrl'] === null) {
+				$options['alreadyLoggedInRedirectUrl'] = $this->request->referer();
 			}
 			$this->handleFlashAndRedirect('alreadyLoggedIn', $options);
 		}
@@ -419,7 +419,7 @@ protected function _afterLogin($user, array $options) {
 		$Auth = $this->_getAuthObject();
 		$Auth->setUser($user);
 		if ($options['successRedirectUrl'] === null) {
-			$options['successRedirectUrl'] = $this->request->referer();
+			$options['successRedirectUrl'] = $Auth->redirectUrl();
 		}
 		$this->handleFlashAndRedirect('success', $options);
 		return true;