Refine the post login URL logic to prioritize any postLoginUrl explic…

…itly set in the request to that stored in the session
pixl8 · Jan 28, 2015 · fcdd655 · fcdd655
1 parent f5c0bc8
commit fcdd655
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/system/handlers/Login.cfc b/system/handlers/Login.cfc
@@ -9,7 +9,7 @@ component output=false {
 		}
 		var loginId      = rc.loginId  ?: "";
 		var password     = rc.password ?: "";
-		var postLoginUrl = websiteLoginService.getPostLoginUrl( rc.postLoginUrl ?: cgi.http_referer );
+		var postLoginUrl = Len( Trim( rc.postLoginUrl ?: "" ) ) ? rc.postLoginUrl : websiteLoginService.getPostLoginUrl( cgi.http_referer );
 		var rememberMe   = _getRememberMeAllowed() && IsBoolean( rc.rememberMe ?: "" ) && rc.rememberMe;
 		var loggedIn     = websiteLoginService.login(
 			  loginId              = loginId
@@ -22,6 +22,7 @@ component output=false {
 			websiteLoginService.clearPostLoginUrl();
 			setNextEvent( url=postLoginUrl );
 		}
+		websiteLoginService.setPostLoginUrl( postLoginUrl );
 
 		setNextEvent( url=event.buildLink( page="login" ), persistStruct={
 			  loginId      = loginId