Merge pull request #5531 from NodeBB/patch_5491

Fix #5491

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);
 

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,
 				});