fix relative_path image url for sub installs

This commit is contained in:
Barış Soner Uşaklı
2015-02-10 14:47:01 -05:00
parent 57d6bb3b4c
commit 6a55cdfbaf
2 changed files with 2 additions and 2 deletions

View File

@@ -438,7 +438,7 @@ accountsController.uploadPicture = function (req, res, next) {
user.setUserFields(updateUid, {uploadedpicture: image.url, picture: image.url});
res.json([{name: userPhoto.name, url: image.url}]);
res.json([{name: userPhoto.name, url: nconf.get('relative_path') + image.url}]);
}
if (err) {

View File

@@ -119,7 +119,7 @@ var async = require('async'),
if (user.picture) {
if (user.picture === user.uploadedpicture) {
user.picture = user.picture.indexOf('http') === -1 ? nconf.get('relative_path') + user.picture : user.picture;
user.picture = user.uploadedpicture = user.picture.indexOf('http') === -1 ? nconf.get('relative_path') + user.picture : user.picture;
} else {
user.picture = User.createGravatarURLFromEmail(user.email);
}