Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-29 10:06:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix if cover URL is external URL (#6026)

Browse Source 
* Fix if cover URL is external URL

Currently, when cover:url is an external URL, it's concat with relative path

* Fix if cover URL is external URL

Currently, when cover:url is an external URL, it's concat with relative path [fix barisusakli]

* Fix missing '

* Add User (uid) Welcome Notification

* Revert "Fix missing '"

This reverts commit 2da2d98ae2.

* Revert "Revert "Fix missing '""

This reverts commit f4fca746e8.

* Revert "Add User (uid) Welcome Notification"

This reverts commit 831e291e78.

* Fix eslint doesnt like nesting ternary operators

* fix space after if
This commit is contained in:
acardinale
2017-11-06 20:45:58 +01:00
committed by Barış Soner Uşaklı
parent c97dce3177
commit 78e65ab8c8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/controllers/accounts/helpers.js
View File

@@ -149,7 +149,13 @@ helpers.getUserDataByUserSlug = function (userslug, callerUID, callback) {
userData.birthday = validator.escape(String(userData.birthday || ''));
userData.moderationNote = validator.escape(String(userData.moderationNote || ''));
userData['cover:url'] = userData['cover:url'] ? (nconf.get('relative_path') + userData['cover:url']) : require('../../coverPhoto').getDefaultProfileCover(userData.uid);
var _userDataCoverUrl;
if (userData['cover:url']) {
_userDataCoverUrl = userData['cover:url'].startsWith('http') ? userData['cover:url'] : (nconf.get('relative_path') + userData['cover:url']);
} else {
_userDataCoverUrl = require('../../coverPhoto').getDefaultProfileCover(userData.uid);
}
userData['cover:url'] = _userDataCoverUrl;
userData['cover:position'] = validator.escape(String(userData['cover:position'] || '50% 50%'));
userData['username:disableEdit'] = !userData.isAdmin && parseInt(meta.config['username:disableEdit'], 10) === 1;
userData['email:disableEdit'] = !userData.isAdmin && parseInt(meta.config['email:disableEdit'], 10) === 1;