Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-14 09:55:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix privileges in file upload and jquery-ui in tags (#4983)

Browse Source
This commit is contained in:
Anil Mandepudi
2016-08-26 14:30:43 -07:00
committed by Julian Lam
parent 8b9f004b7b
commit addabf8e6e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/controllers/uploads.js
View File

@@ -12,7 +12,6 @@ var meta = require('../meta');
var file = require('../file'); var file = require('../file');
var plugins = require('../plugins'); var plugins = require('../plugins');
var image = require('../image'); var image = require('../image');
var privileges = require('../privileges');
var uploadsController = {}; var uploadsController = {};
@@ -52,6 +51,8 @@ uploadsController.uploadPost = function(req, res, next) {
}; };
function uploadAsImage(req, uploadedFile, callback) { function uploadAsImage(req, uploadedFile, callback) {
var privileges = require('../privileges');
async.waterfall([ async.waterfall([
function(next) { function(next) {
privileges.categories.can('upload:post:image', req.body.cid, req.uid, next); privileges.categories.can('upload:post:image', req.body.cid, req.uid, next);
@@ -79,6 +80,8 @@ function uploadAsImage(req, uploadedFile, callback) {
} }
function uploadAsFile(req, uploadedFile, callback) { function uploadAsFile(req, uploadedFile, callback) {
var privileges = require('../privileges');
async.waterfall([ async.waterfall([
function(next) { function(next) {
privileges.categories.can('upload:post:file', req.body.cid, req.uid, next); privileges.categories.can('upload:post:file', req.body.cid, req.uid, next);
@@ -245,6 +248,4 @@ function deleteTempFiles(files) {
}); });
} }
module.exports = uploadsController; module.exports = uploadsController;

2
src/meta/tags.js
View File

@@ -52,7 +52,7 @@ module.exports = function(Meta) {
href: nconf.get('relative_path') + '/manifest.json' href: nconf.get('relative_path') + '/manifest.json'
}, { }, {
rel: "prefetch", rel: "prefetch",
href: nconf.get('relative_path') + '/vendor/jquery/js/jquery-ui-1.10.4.custom.js' + (Meta.config['cache-buster'] ? '?v=' + Meta.config['cache-buster'] : '') href: nconf.get('relative_path') + '/vendor/jquery/js/jquery-ui.js' + (Meta.config['cache-buster'] ? '?v=' + Meta.config['cache-buster'] : '')
}]; }];
// Touch icons for mobile-devices // Touch icons for mobile-devices