From f3c48eb14a2f6fe89a06a26fe2bc7c46dabd20ed Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 8 Jul 2016 17:17:59 -0400 Subject: [PATCH] oops, #4832 --- src/controllers/api.js | 4 ++-- src/middleware/render.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controllers/api.js b/src/controllers/api.js index 4337eb52ed..73d98842b2 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -51,7 +51,7 @@ apiController.getConfig = function(req, res, next) { config['theme:id'] = meta.config['theme:id']; config['theme:src'] = meta.config['theme:src']; config.defaultLang = meta.config.defaultLang || 'en_GB'; - config.userLang = validator.escape(req.query.lang) || config.defaultLang; + config.userLang = req.query.lang ? validator.escape(req.query.lang) : config.defaultLang; config.loggedIn = !!req.user; config['cache-buster'] = meta.config['cache-buster'] || ''; config.requireEmailConfirmation = parseInt(meta.config.requireEmailConfirmation, 10) === 1; @@ -74,7 +74,7 @@ apiController.getConfig = function(req, res, next) { config.topicsPerPage = settings.topicsPerPage; config.postsPerPage = settings.postsPerPage; config.notificationSounds = settings.notificationSounds; - config.userLang = validator.escape(req.query.lang) || settings.userLang || config.defaultLang; + config.userLang = (req.query.lang ? validator.escape(req.query.lang) : null) || settings.userLang || config.defaultLang; config.openOutgoingLinksInNewTab = settings.openOutgoingLinksInNewTab; config.topicPostSort = settings.topicPostSort || config.topicPostSort; config.categoryTopicSort = settings.categoryTopicSort || config.categoryTopicSort; diff --git a/src/middleware/render.js b/src/middleware/render.js index 2a56049403..63c5662268 100644 --- a/src/middleware/render.js +++ b/src/middleware/render.js @@ -81,7 +81,7 @@ module.exports = function(middleware) { } str = template + str; var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB'; - language = validator.escape(req.query.lang) || language; + language = req.query.lang ? validator.escape(req.query.lang) : language; translator.translate(str, language, function(translated) { translated = translator.unescape(translated); translated = translated + '';