From 6ce422feaba585d10ec46d21326b4f5b30862e10 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Sat, 30 Dec 2017 09:06:02 +0530 Subject: [PATCH] FIX: respect 'topic page title includes category' client side --- app/assets/javascripts/discourse/routes/topic.js.es6 | 2 +- config/site_settings.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6 index 83205ff599c..9cc709d1979 100644 --- a/app/assets/javascripts/discourse/routes/topic.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic.js.es6 @@ -24,7 +24,7 @@ const TopicRoute = Discourse.Route.extend({ cat = model.get('category'); // Only display uncategorized in the title tag if it was renamed - if (cat && !(cat.get('isUncategorizedCategory') && cat.get('name').toLowerCase() === "uncategorized")) { + if (this.siteSettings.topic_page_title_includes_category && cat && !(cat.get('isUncategorizedCategory') && cat.get('name').toLowerCase() === "uncategorized")) { let catName = cat.get('name'); const parentCategory = cat.get('parentCategory'); diff --git a/config/site_settings.yml b/config/site_settings.yml index e03b424ae7d..c94fff84893 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -1384,7 +1384,9 @@ uncategorized: zh_CN: 350 zh_TW: 350 - topic_page_title_includes_category: true + topic_page_title_includes_category: + default: true + client: true native_app_install_banner: false