Merge pull request #3035 from FokkeZB/patch-3

Fix link in email notifications

src/topics/follow.js

@@ -160,6 +160,7 @@ module.exports = function(Topics) {
 								postBody: postData.content,
 								site_title: meta.config.title || 'NodeBB',
 								username: data.userData.username,
+								userslug: data.userData.userslug,
 								url: nconf.get('url') + '/topic/' + postData.topic.tid,
 								base_url: nconf.get('url')
 							}, next);
@@ -172,4 +173,4 @@ module.exports = function(Topics) {
 			}
 		], callback);
 	};
-};
+};

src/views/emails/notif_post.tpl

@@ -12,5 +12,5 @@
 
 <hr />
 <p>
-	[[email:notif.post.unsub.info]] <a href="{base_url}/user/{username}/settings">[[email:unsub.cta]]</a>.
-</p>
+	[[email:notif.post.unsub.info]] <a href="{base_url}/user/{userslug}/settings">[[email:unsub.cta]]</a>.
+</p>

src/views/emails/notif_post_plaintext.tpl

@@ -11,4 +11,4 @@
 
 ===
 
-[[email:notif.post.unsub.info]] <a href="{base_url}/user/{username}/settings">[[email:unsub.cta]]</a>.
+[[email:notif.post.unsub.info]] <a href="{base_url}/user/{userslug}/settings">[[email:unsub.cta]]</a>.