Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-20 15:30:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #1497

Browse Source 
fixes user images in subfolder installs, if user image has https dont
append relative_path,
also removes relative_path in ajaxify.loadData so it doesnt call
/forum/api/forum/category etc.
This commit is contained in:
barisusakli
2014-05-30 15:22:52 -04:00
parent be19222817
commit e035d8f1de
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/user.js
View File

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