From cd4cb240c8f86dd5f4e83b3f477ece2db2b16897 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Wed, 15 Jan 2014 02:33:20 -0500 Subject: [PATCH] upload file icon in composer was visible even when uploads were disabled --- public/src/ajaxify.js | 2 +- src/routes/api.js | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 478797733f..5401d24ff2 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -178,7 +178,7 @@ var ajaxify = {}; } else if (window.location.pathname !== '/outgoing') { // External Link - if (config.useOutgoingLinksPage == true) { + if (config.useOutgoingLinksPage) { ajaxify.go('outgoing?url=' + encodeURIComponent(this.href)); e.preventDefault(); } diff --git a/src/routes/api.js b/src/routes/api.js index d0da395d54..f88fc8fa35 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -38,10 +38,9 @@ var path = require('path'), config.maximumUsernameLength = meta.config.maximumUsernameLength; config.minimumPasswordLength = meta.config.minimumPasswordLength; config.maximumSignatureLength = meta.config.maximumSignatureLength; - config.useOutgoingLinksPage = meta.config.useOutgoingLinksPage; - config.allowGuestPosting = meta.config.allowGuestPosting; - config.allowRegistration = meta.config.allowRegistration || '1'; - config.allowFileUploads = meta.config.allowFileUploads; + config.useOutgoingLinksPage = parseInt(meta.config.useOutgoingLinksPage, 10) === 1; + config.allowGuestPosting = parseInt(meta.config.allowGuestPosting, 10) === 1; + config.allowFileUploads = parseInt(meta.config.allowFileUploads, 10) === 1; config.maximumFileSize = meta.config.maximumFileSize; config.emailSetup = !!meta.config['email:from']; config.defaultLang = meta.config.defaultLang || 'en';