From 78e65ab8c8885ef14460e2632cf01631ae480cf4 Mon Sep 17 00:00:00 2001
From: acardinale <acardinale@users.noreply.github.com>
Date: Mon, 6 Nov 2017 20:45:58 +0100
Subject: [PATCH] Fix if cover URL is external URL (#6026)
* 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 2da2d98ae295f1d7db63076587a3feae530dbe64.
* Revert "Revert "Fix missing '""
This reverts commit f4fca746e89d8c8b9515515bdbc42d449ebe0194.
* Revert "Add User (uid) Welcome Notification"
This reverts commit 831e291e78f27f2ac9382612772126c36490d36b.
* Fix eslint doesnt like nesting ternary operators
* fix space after if
---
src/controllers/accounts/helpers.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js
index e35ac514d9..38407e45b3 100644
--- a/src/controllers/accounts/helpers.js
+++ b/src/controllers/accounts/helpers.js
@@ -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;