From adf14ea57c8d0d89a96e117c5419646ede0a6308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 16 May 2023 13:05:03 -0400 Subject: [PATCH] fix: browser title if options.title is undefined --- src/controllers/helpers.js | 5 +++-- src/middleware/render.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js index 3d15ea12be..5981cdc47a 100644 --- a/src/controllers/helpers.js +++ b/src/controllers/helpers.js @@ -238,10 +238,11 @@ helpers.buildBreadcrumbs = function (crumbs) { }; helpers.buildTitle = function (pageTitle) { - const titleLayout = meta.config.titleLayout || '{pageTitle} | {browserTitle}'; + pageTitle = pageTitle || ''; + const titleLayout = meta.config.titleLayout || `${pageTitle ? '{pageTitle} | ' : ''}{browserTitle}`; const browserTitle = validator.escape(String(meta.config.browserTitle || meta.config.title || 'NodeBB')); - pageTitle = pageTitle || ''; + const title = titleLayout.replace('{pageTitle}', () => pageTitle).replace('{browserTitle}', () => browserTitle); return title; }; diff --git a/src/middleware/render.js b/src/middleware/render.js index 223d556150..d8a98a9f3e 100644 --- a/src/middleware/render.js +++ b/src/middleware/render.js @@ -162,7 +162,7 @@ module.exports = function (middleware) { templateValues.configJSON = jsesc(JSON.stringify(res.locals.config), { isScriptContext: true }); - const title = translator.unescape(utils.stripHTMLTags(options.title)); + const title = translator.unescape(utils.stripHTMLTags(options.title || '')); const results = await utils.promiseParallel({ isAdmin: user.isAdministrator(req.uid), isGlobalMod: user.isGlobalModerator(req.uid),