Merge branch 'master' of https://github.com/NodeBB/NodeBB

package.json

@@ -57,8 +57,8 @@
     "nodebb-plugin-spam-be-gone": "0.4.9",
     "nodebb-rewards-essentials": "0.0.9",
     "nodebb-theme-lavender": "3.0.13",
-    "nodebb-theme-persona": "4.1.14",
-    "nodebb-theme-vanilla": "5.1.5",
+    "nodebb-theme-persona": "4.1.15",
+    "nodebb-theme-vanilla": "5.1.6",
     "nodebb-widget-essentials": "2.0.10",
     "nodemailer": "2.0.0",
     "nodemailer-sendmail-transport": "1.0.0",

public/src/ajaxify.js

@@ -307,7 +307,7 @@ $(document).ready(function() {
 								e.preventDefault();
 							}
 						}
-					} else if (window.location.pathname !== '/outgoing') {
+					} else if (!this.target && window.location.pathname !== '/outgoing') {
 						if (config.openOutgoingLinksInNewTab) {
 							window.open(this.href, '_blank');
 							e.preventDefault();

src/controllers/api.js

@@ -222,7 +222,7 @@ apiController.getObject = function(req, res, next) {
 
 apiController.getCurrentUser = function(req, res, next) {
 	if (!req.uid) {
-		return helpers.notAllowed(req, res);
+		return res.status(401).json('not-authorized');
 	}
 	async.waterfall([
 		function(next) {

src/views/admin/extend/plugins.tpl

@@ -3,7 +3,7 @@
 	<li><a href="#active" data-toggle="tab">Active</a></li>
 	<li><a href="#upgrade" data-toggle="tab">
 		Out of Date
-		<span class="badge">{../upgradeCount}</span>
+		<span class="badge">{upgradeCount}</span>
 	</a></li>
 	<li><a href="#download" data-toggle="tab">Find Plugins</a></li>
 </ul>