Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-18 02:20:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #2304

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-01-31 15:20:17 -05:00
parent b2cb3def98
commit ac1f7eefe5
23 changed files with 106 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/admin/categories.js
View File

@@ -13,7 +13,7 @@ categoriesController.get = function (req, res, callback) {
async.waterfall([
function (next) {
async.parallel({
category: async.apply(categories.getCategories, [req.params.category_id], req.user.uid),
category: async.apply(categories.getCategories, [req.params.category_id], req.uid),
allCategories: async.apply(categories.buildForSelect, req.uid, 'read'),
}, next);
},

2
src/controllers/admin/uploads.js
View File

@@ -253,7 +253,7 @@ function uploadImage(filename, folder, uploadedFile, req, res, next) {
async.waterfall([
function (next) {
if (plugins.hasListeners('filter:uploadImage')) {
plugins.fireHook('filter:uploadImage', { image: uploadedFile, uid: req.user.uid }, next);
plugins.fireHook('filter:uploadImage', { image: uploadedFile, uid: req.uid }, next);
} else {
file.saveFileToLocal(filename, folder, uploadedFile.path, next);
}

2
src/controllers/admin/users.js
View File

@@ -191,7 +191,7 @@ usersController.getCSV = function (req, res, next) {
}
events.log({
type: 'getUsersCSV',
uid: req.user.uid,
uid: req.uid,
ip: req.ip,
});
async.waterfall([