From 8c45411ccc9778c54c6f3c419ef1fd4abbba7a57 Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak <p.jaszkow@gmail.com>
Date: Wed, 15 Mar 2017 20:00:05 -0700
Subject: [PATCH] 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,
 				});