dont redirect back to reset password after login

12 years ago · 9c14618d55
parent 7d50551392
commit 9c14618d55
1 changed files with 4 additions and 2 deletions
--- a/public/src/forum/login.js
+++ b/public/src/forum/login.js
@ -32,8 +32,10 @@
 					$('#login-error-notify').show();
 				} else {
 					$('#login-error-notify').hide();
-					//window.location.replace(RELATIVE_PATH + "/?loggedin");
-					history.go(-1);
+					if(app.previousUrl.indexOf('/reset/') != -1)
+						window.location.replace(RELATIVE_PATH + "/?loggedin");
+					else
+						window.location.replace(app.previousUrl + "?loggedin");

 					app.loadConfig();
 				}