mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-14 09:55:47 +01:00
fix privileges in file upload and jquery-ui in tags (#4983)
This commit is contained in:
committed by
Julian Lam
parent
8b9f004b7b
commit
addabf8e6e
@@ -12,7 +12,6 @@ var meta = require('../meta');
|
||||
var file = require('../file');
|
||||
var plugins = require('../plugins');
|
||||
var image = require('../image');
|
||||
var privileges = require('../privileges');
|
||||
|
||||
var uploadsController = {};
|
||||
|
||||
@@ -52,6 +51,8 @@ uploadsController.uploadPost = function(req, res, next) {
|
||||
};
|
||||
|
||||
function uploadAsImage(req, uploadedFile, callback) {
|
||||
var privileges = require('../privileges');
|
||||
|
||||
async.waterfall([
|
||||
function(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) {
|
||||
var privileges = require('../privileges');
|
||||
|
||||
async.waterfall([
|
||||
function(next) {
|
||||
privileges.categories.can('upload:post:file', req.body.cid, req.uid, next);
|
||||
@@ -245,6 +248,4 @@ function deleteTempFiles(files) {
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
module.exports = uploadsController;
|
||||
|
||||
@@ -52,7 +52,7 @@ module.exports = function(Meta) {
|
||||
href: nconf.get('relative_path') + '/manifest.json'
|
||||
}, {
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user