Merge pull request #705 from SISheogorath/fix/camelcaseConfig

Remove camel case from `imageuploadtype` in config

1 files changed, 8 insertions, 2 deletions

diff --git a/lib/config/index.js b/lib/config/index.js
index 4f6b4b6a..0051e485 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -13,6 +13,7 @@ const debugConfig = {
   debug: (env === Environment.development)
 }
 
+// Get version string from package.json
 const {version} = require(path.join(appRootPath, 'package.json'))
 
 const packageConfig = {
@@ -20,7 +21,7 @@ const packageConfig = {
   minimumCompatibleVersion: '0.5.0'
 }
 
-const configFilePath = path.join(__dirname, '../../config.json')
+const configFilePath = path.join(appRootPath, 'config.json')
 const fileConfig = fs.existsSync(configFilePath) ? require(configFilePath)[env] : undefined
 
 let config = require('./default')
@@ -97,8 +98,13 @@ config.isLDAPEnable = config.ldap.url
 config.isSAMLEnable = config.saml.idpSsoUrl
 config.isPDFExportEnable = config.allowpdfexport
 
+// merge legacy values
+if (config.imageUploadType && !config.imageuploadtype) {
+  config.imageuploadtype = config.imageUploadType
+}
+
 // figure out mime types for image uploads
-switch (config.imageUploadType) {
+switch (config.imageuploadtype) {
   case 'imgur':
     config.allowedUploadMimeTypes = [
       'image/jpeg',