Browse Source

fix defaults

Keisuke SATO 10 years ago
parent
commit
d282c34750
1 changed files with 4 additions and 2 deletions
  1. 4 2
      lib/models/config.js

+ 4 - 2
lib/models/config.js

@@ -166,7 +166,9 @@ module.exports = function(crowi) {
 
 
   configSchema.statics.isUploadable = function(config)
   configSchema.statics.isUploadable = function(config)
   {
   {
-    if (crowi.env.FILE_UPLOAD == 'aws' && (
+    var method = crowi.env.FILE_UPLOAD || 'aws';
+
+    if (method == 'aws' && (
         !config.crowi['aws:accessKeyId'] ||
         !config.crowi['aws:accessKeyId'] ||
         !config.crowi['aws:secretAccessKey'] ||
         !config.crowi['aws:secretAccessKey'] ||
         !config.crowi['aws:region'] ||
         !config.crowi['aws:region'] ||
@@ -174,7 +176,7 @@ module.exports = function(crowi) {
       return false;
       return false;
     }
     }
 
 
-    return crowi.env.FILE_UPLOAD != 'none';
+    return method != 'none';
   };
   };
 
 
   /*
   /*