From a62b028e160da93d515c33081b10c25bd92f7a93 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Fri, 9 Dec 2016 13:48:29 -0500 Subject: [PATCH] Remove the open_topic_featured_link_in_external_window setting. Use the user preference. --- .../discourse/lib/render-topic-featured-link.js.es6 | 4 +++- config/locales/server.en.yml | 2 -- config/site_settings.yml | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6 b/app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6 index c8c3d640f80..3b747284fdf 100644 --- a/app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6 +++ b/app/assets/javascripts/discourse/lib/render-topic-featured-link.js.es6 @@ -8,7 +8,9 @@ export function addFeaturedLinkMetaDecorator(decorator) { } function extractLinkMeta(topic) { - const href = topic.featured_link, target = Discourse.SiteSettings.open_topic_featured_link_in_external_window ? '_blank' : ''; + const href = topic.featured_link, + target = Discourse.User.currentProp('external_links_in_new_tab') ? '_blank' : ''; + if (!href) { return; } let domain = extractDomainFromUrl(href); diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 3c1d84d8338..e5a78f46506 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -851,8 +851,6 @@ en: min_private_message_post_length: "Minimum allowed post length in characters for messages" max_post_length: "Maximum allowed post length in characters" topic_featured_link_enabled: "Enable posting a link with topics." - topic_featured_link_onebox: "Show an onebox in the post body if possible and prevent editing post content." - open_topic_featured_link_in_external_window: "Open topic featured link in a external window." show_topic_featured_link_in_digest: "Show the topic featured link in the digest email." min_topic_title_length: "Minimum allowed topic title length in characters" max_topic_title_length: "Maximum allowed topic title length in characters" diff --git a/config/site_settings.yml b/config/site_settings.yml index e901cd070d8..468818f24ea 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -436,9 +436,6 @@ posting: topic_featured_link_enabled: client: true default: false - open_topic_featured_link_in_external_window: - client: true - default: true body_min_entropy: 7 min_topic_title_length: client: true