From 37fe438c63359e9ce25a307aea48c752f0ce7c2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 17 Mar 2015 15:53:05 -0400
Subject: [PATCH] reset fix for t.js bug :rage3:

---
 public/src/client/reset.js      |  1 +
 public/src/client/reset_code.js | 16 +---------------
 src/controllers/index.js        |  7 +++++--
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/public/src/client/reset.js b/public/src/client/reset.js
index 7e272c3284..568d0739a1 100644
--- a/public/src/client/reset.js
+++ b/public/src/client/reset.js
@@ -24,6 +24,7 @@ define('forum/reset', function() {
 				successEl.addClass('hide').hide();
 				errorEl.removeClass('hide').show();
 			}
+			return false;
 		});
 	};
 
diff --git a/public/src/client/reset_code.js b/public/src/client/reset_code.js
index c0f46dc356..846feffb42 100644
--- a/public/src/client/reset_code.js
+++ b/public/src/client/reset_code.js
@@ -31,22 +31,8 @@ define('forum/reset_code', function() {
 					window.location.href = RELATIVE_PATH + '/login';
 				});
 			}
+			return false;
 		});
-
-		// socket.emit('user.reset.valid', reset_code, function(err, valid) {
-		// 	if(err) {
-		// 		return app.alertError(err.message);
-		// 	}
-
-		// 	if (valid) {
-		// 		resetEl.prop('disabled', false);
-		// 	} else {
-		// 		var formEl = $('#reset-form');
-		// 		// Show error message
-		// 		$('#error').show();
-		// 		formEl.remove();
-		// 	}
-		// });
 	};
 
 	return ResetCode;
diff --git a/src/controllers/index.js b/src/controllers/index.js
index 6aba26bb1f..02e2b4a672 100644
--- a/src/controllers/index.js
+++ b/src/controllers/index.js
@@ -52,15 +52,18 @@ Controllers.home = function(req, res, next) {
 Controllers.reset = function(req, res, next) {
 	if (req.params.code) {
 		user.reset.validate(req.params.code, function(err, valid) {
+			if (err) {
+				return next(err);
+			}
 			res.render('reset_code', {
 				valid: valid,
-				reset_code: req.params.code ? req.params.code : null,
+				code: req.params.code ? req.params.code : null,
 				breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]', url: '/reset'}, {text: '[[reset_password:update_password]]'}])
 			});
 		});
 	} else {
 		res.render('reset', {
-			reset_code: req.params.code ? req.params.code : null,
+			code: req.params.code ? req.params.code : null,
 			breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]'}])
 		});
 	}