From 8c45411ccc9778c54c6f3c419ef1fd4abbba7a57 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Wed, 15 Mar 2017 20:00:05 -0700 Subject: [PATCH 1/4] Fix #5491 --- public/src/client/account/edit.js | 2 +- src/user/picture.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js index 13b84e3023..02c1e57200 100644 --- a/public/src/client/account/edit.js +++ b/public/src/client/account/edit.js @@ -188,7 +188,7 @@ define('forum/account/edit', ['forum/account/header', 'translator', 'components' function handleImageUpload(modal) { function onUploadComplete(urlOnServer) { - urlOnServer = urlOnServer + '?' + Date.now(); + urlOnServer = config.relative_path + urlOnServer + '?' + Date.now(); updateHeader(urlOnServer); diff --git a/src/user/picture.js b/src/user/picture.js index 13288774b2..a4dee130fe 100644 --- a/src/user/picture.js +++ b/src/user/picture.js @@ -223,7 +223,7 @@ module.exports = function (User) { }, function (upload, next) { next(null, { - url: nconf.get('relative_path') + upload.url, + url: upload.url, path: upload.path, name: image.name, }); From 8f8babf90bca84f9442ff36527e7947a629030d6 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Wed, 15 Mar 2017 20:09:07 -0700 Subject: [PATCH 2/4] Fix tests --- src/user/picture.js | 1 - test/uploads.js | 2 +- test/user.js | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/user/picture.js b/src/user/picture.js index a4dee130fe..2b4f45d344 100644 --- a/src/user/picture.js +++ b/src/user/picture.js @@ -2,7 +2,6 @@ var async = require('async'); var fs = require('fs'); -var nconf = require('nconf'); var winston = require('winston'); var request = require('request'); var mime = require('mime'); diff --git a/test/uploads.js b/test/uploads.js index 624b1c25b7..0daf0407b9 100644 --- a/test/uploads.js +++ b/test/uploads.js @@ -71,7 +71,7 @@ describe('Upload Controllers', function () { assert.equal(res.statusCode, 200); assert(Array.isArray(body)); assert.equal(body.length, 1); - assert.equal(body[0].url, nconf.get('relative_path') + '/assets/uploads/profile/' + regularUid + '-profileavatar.png'); + assert.equal(body[0].url, '/assets/uploads/profile/' + regularUid + '-profileavatar.png'); done(); }); }); diff --git a/test/user.js b/test/user.js index c956bfdcde..e417dac2d7 100644 --- a/test/user.js +++ b/test/user.js @@ -522,7 +522,7 @@ describe('User', function () { }; User.uploadPicture(uid, picture, function (err, uploadedPicture) { assert.ifError(err); - assert.equal(uploadedPicture.url, nconf.get('relative_path') + '/assets/uploads/profile/' + uid + '-profileavatar.png'); + assert.equal(uploadedPicture.url, '/assets/uploads/profile/' + uid + '-profileavatar.png'); assert.equal(uploadedPicture.path, path.join(nconf.get('base_dir'), 'public', 'uploads', 'profile', uid + '-profileavatar.png')); done(); }); From 449352d8996b4c98be67052fbb5b68fdc65cd0f2 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Thu, 16 Mar 2017 11:24:31 +0300 Subject: [PATCH 3/4] wait for all routes to load before listening --- src/plugins.js | 4 ++-- src/routes/index.js | 5 +++-- src/webserver.js | 3 +-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins.js b/src/plugins.js index 3c2f8ce790..7c2ecaee25 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -127,7 +127,6 @@ var middleware; }; Plugins.reloadRoutes = function (callback) { - callback = callback || function () {}; var router = express.Router(); router.hotswapId = 'plugins'; @@ -138,7 +137,8 @@ var middleware; var controllers = require('./controllers'); Plugins.fireHook('static:app.load', { app: app, router: router, middleware: middleware, controllers: controllers }, function (err) { if (err) { - return winston.error('[plugins] Encountered error while executing post-router plugins hooks: ' + err.message); + winston.error('[plugins] Encountered error while executing post-router plugins hooks: ' + err.message); + return callback(err); } hotswap.replace('plugins', router); diff --git a/src/routes/index.js b/src/routes/index.js index d0029798de..57b1d5c942 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -85,7 +85,7 @@ function groupRoutes(app, middleware, controllers) { setupPageRoute(app, '/groups/:slug/members', middleware, middlewares, controllers.groups.members); } -module.exports = function (app, middleware, hotswapIds) { +module.exports = function (app, middleware, hotswapIds, callback) { var routers = [ express.Router(), // plugin router express.Router(), // main app router @@ -209,8 +209,9 @@ module.exports = function (app, middleware, hotswapIds) { async.apply(user.addInterstitials), ], function (err) { if (err) { - return winston.error(err); + return callback(err); } winston.info('Routes added'); + callback(); }); }; diff --git a/src/webserver.js b/src/webserver.js index e254d71008..09da4a4d08 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -96,8 +96,7 @@ function initializeNodeBB(callback) { plugins.fireHook('filter:hotswap.prepare', [], next); }, function (hotswapIds, next) { - routes(app, middleware, hotswapIds); - next(); + routes(app, middleware, hotswapIds, next); }, function (next) { async.series([ From da1858f674d45406e2c7c2c20e9af9aeea87086c Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Thu, 16 Mar 2017 18:57:33 +0000 Subject: [PATCH 4/4] Incremented version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7a12ad430f..bc0d1e62d8 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "1.4.4", + "version": "1.4.5", "homepage": "http://www.nodebb.org", "repository": { "type": "git",