From a186ea0fe373048aab24de5b8890deb619e34bf2 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 22 Jan 2021 10:01:36 -0500
Subject: [PATCH] fix: registration completion overriding returnTo if it was
 already set

---
 src/controllers/authentication.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/controllers/authentication.js b/src/controllers/authentication.js
index ea0378c180..c7f8b5f1f8 100644
--- a/src/controllers/authentication.js
+++ b/src/controllers/authentication.js
@@ -35,7 +35,7 @@ async function registerAndLoginUser(req, res, userData) {
 		req.session.registration = userData;
 
 		if (req.body.referrer) {
-			req.session.referrer = req.body.referrer;
+			req.session.returnTo = req.body.referrer;
 		}
 		if (req.body.noscript === 'true') {
 			res.redirect(nconf.get('relative_path') + '/register/complete');
@@ -60,7 +60,7 @@ async function registerAndLoginUser(req, res, userData) {
 		await user.joinGroupsFromInvitation(uid, userData.email);
 	}
 	await user.deleteInvitationKey(userData.email);
-	const referrer = req.body.referrer || req.session.referrer || nconf.get('relative_path') + '/';
+	const referrer = req.body.referrer || req.session.returnTo || nconf.get('relative_path') + '/';
 	const complete = await plugins.hooks.fire('filter:register.complete', { uid: uid, referrer: referrer });
 	req.session.returnTo = complete.referrer;
 	return complete;