From cb6db3625ca085ddd1832262079e15df0a831cd9 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 4 Aug 2016 21:12:03 +0300 Subject: [PATCH 1/3] closes #4906 --- src/controllers/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/api.js b/src/controllers/api.js index 35f894e002..706a36cef9 100644 --- a/src/controllers/api.js +++ b/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) { From f060c7a3786b8d38596862d6e216716b75d32465 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 4 Aug 2016 15:47:54 -0400 Subject: [PATCH 2/3] not using relative reference for tjs value --- src/views/admin/extend/plugins.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/extend/plugins.tpl b/src/views/admin/extend/plugins.tpl index 58a8b90651..1e240b7fd6 100644 --- a/src/views/admin/extend/plugins.tpl +++ b/src/views/admin/extend/plugins.tpl @@ -3,7 +3,7 @@
  • Active
  • Out of Date - {../upgradeCount} + {upgradeCount}
  • Find Plugins
  • From f593d925ae2323a12c67f65ac25cf09f02f04f85 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 4 Aug 2016 16:17:51 -0400 Subject: [PATCH 3/3] closes #4826, modifying ajaxify so it does not override links with target set explicitly --- package.json | 4 ++-- public/src/ajaxify.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 22da7f7443..7c87d1731e 100644 --- a/package.json +++ b/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", diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 7280de01ed..17ac97c794 100644 --- a/public/src/ajaxify.js +++ b/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();