From 28c24631b83a179b85801d7b91d90225c9ba075e Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Wed, 20 Feb 2019 19:33:54 +0100 Subject: [PATCH] FIX: ensures panel's shareUrl is not erased by topic's shareUrl (#7035) --- .../javascripts/discourse/components/share-panel.js.es6 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/components/share-panel.js.es6 b/app/assets/javascripts/discourse/components/share-panel.js.es6 index 2ac3a16cfe1..deb4039d77c 100644 --- a/app/assets/javascripts/discourse/components/share-panel.js.es6 +++ b/app/assets/javascripts/discourse/components/share-panel.js.es6 @@ -35,8 +35,10 @@ export default Ember.Component.extend({ return I18n.t("share.topic", { topicTitle }); }, - @computed("topic.shareUrl") - shareUrl(shareUrl) { + @computed("panel.model.shareUrl", "topic.shareUrl") + shareUrl(forcedShareUrl, shareUrl) { + shareUrl = forcedShareUrl || shareUrl; + if (Ember.isEmpty(shareUrl)) { return; }