upload_url shouldn't use path.join

v1.18.x
psychobunny 11 years ago
parent 51a7d163be
commit 6f1a795f0e

@ -90,7 +90,7 @@ function loadConfig() {
nconf.defaults({ nconf.defaults({
base_dir: __dirname, base_dir: __dirname,
themes_path: path.join(__dirname, 'node_modules'), themes_path: path.join(__dirname, 'node_modules'),
upload_url: path.join(path.sep, 'uploads', path.sep), upload_url: '/uploads/',
views_dir: path.join(__dirname, 'public/templates') views_dir: path.join(__dirname, 'public/templates')
}); });

@ -8,6 +8,7 @@ var fs = require('fs'),
var file = {}; var file = {};
file.saveFileToLocal = function(filename, tempPath, callback) { file.saveFileToLocal = function(filename, tempPath, callback) {
var uploadPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), filename); var uploadPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), filename);
winston.info('Saving file '+ filename +' to : ' + uploadPath); winston.info('Saving file '+ filename +' to : ' + uploadPath);
@ -17,7 +18,7 @@ file.saveFileToLocal = function(filename, tempPath, callback) {
is.on('end', function () { is.on('end', function () {
callback(null, { callback(null, {
url: (nconf.get('upload_url') + filename).split(path.sep).join('/') url: nconf.get('upload_url') + filename
}); });
}); });
@ -29,6 +30,4 @@ file.saveFileToLocal = function(filename, tempPath, callback) {
is.pipe(os); is.pipe(os);
}; };
module.exports = file; module.exports = file;
Loading…
Cancel
Save