From b5481ceed20ba0dea65e44426f912503751aec1a Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 14 Oct 2014 11:48:16 -0400
Subject: [PATCH] property fixed #2087

---
 public/src/client/login.js   | 10 ++++++++++
 src/routes/authentication.js |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/public/src/client/login.js b/public/src/client/login.js
index c4600c36ac..e7079ddfed 100644
--- a/public/src/client/login.js
+++ b/public/src/client/login.js
@@ -33,6 +33,16 @@ define('forum/login', function() {
 		});
 
 		$('#content #username').focus();
+
+		// Add "returnTo" data if present
+		if (app.previousUrl) {
+			var returnToEl = document.createElement('input');
+			returnToEl.type = 'hidden';
+			returnToEl.name = 'returnTo';
+			returnToEl.value = app.previousUrl.replace(window.location.origin + RELATIVE_PATH, '');
+			$(returnToEl).appendTo(formEl);
+			console.log('appended');
+		}
 	};
 
 	return Login;
diff --git a/src/routes/authentication.js b/src/routes/authentication.js
index c405649f66..edd984bc4b 100644
--- a/src/routes/authentication.js
+++ b/src/routes/authentication.js
@@ -83,6 +83,11 @@
 			return res.status(404).send('');
 		}
 
+		// Handle returnTo data
+		if (req.body.hasOwnProperty('returnTo') && !req.session.returnTo) {
+			req.session.returnTo = req.body.returnTo;
+		}
+
 		if (req.body.username && utils.isEmailValid(req.body.username)) {
 			user.getUsernameByEmail(req.body.username, function(err, username) {
 				if (err) {