From 4fa80263b02442b87255179607f7f23b8d8d103a Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 12 Aug 2014 14:15:01 -0400 Subject: [PATCH 1/2] fixed #1981 --- src/middleware/admin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/middleware/admin.js b/src/middleware/admin.js index d9d36791ce..92ab6de9e2 100644 --- a/src/middleware/admin.js +++ b/src/middleware/admin.js @@ -16,7 +16,7 @@ var app, middleware.isAdmin = function(req, res, next) { if (!req.user) { - return res.redirect('/login?next=admin'); + return res.redirect(nconf.get('relative_path') + '/login?next=admin'); } user.isAdministrator((req.user && req.user.uid) ? req.user.uid : 0, function (err, isAdmin) { From c358ff3d83bf1c1577ed6bbcd256da8183fd3b59 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 12 Aug 2014 14:39:58 -0400 Subject: [PATCH 2/2] fix isSortedSetMembers on mongo --- src/database/mongo/sorted.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/database/mongo/sorted.js b/src/database/mongo/sorted.js index fbcaf3bb08..267446ae7e 100644 --- a/src/database/mongo/sorted.js +++ b/src/database/mongo/sorted.js @@ -151,13 +151,15 @@ module.exports = function(db, module) { if (err) { return callback(err); } + results = results.map(function(item) { return item.value; }); + values = values.map(function(value) { return results.indexOf(value) !== -1; }); - callback(err, results); + callback(null, values); }); };