Fix #5416, uploads path config setting

- Finish moving uploads route to `/assets/uploads`
- Remove `upload_url` config setting, it was broken
This commit is contained in:
Peter Jaszkowiak
2017-02-08 11:41:24 -07:00
parent d43564dbbd
commit aaacdb8413
16 changed files with 79 additions and 58 deletions

View File

@@ -86,7 +86,7 @@ module.exports = function (SocketUser) {
function (userData, next) {
if (userData.uploadedpicture && !userData.uploadedpicture.startsWith('http')) {
var pathToFile = path.join(nconf.get('base_dir'), 'public', userData.uploadedpicture);
if (pathToFile.startsWith(path.join(nconf.get('base_dir'), nconf.get('upload_path')))) {
if (pathToFile.startsWith(nconf.get('upload_path'))) {
require('fs').unlink(pathToFile, function (err) {
if (err) {
winston.error(err);