make it possible to use other formats than json in common.loadFiles a…

…nd common.loadFilesSync
indexzero · Sep 16, 2012 · 8e987b8 · 8e987b8
1 parent f9b24f1
commit 8e987b8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/nconf/common.js b/lib/nconf/common.js
@@ -58,7 +58,7 @@ common.loadFiles = function (files, callback) {
     });
   }
 
-  async.map(files, parseFile, function (err, objs) {
+  async.map(options.files, parseFile, function (err, objs) {
     return err ? callback(err) : callback(null, common.merge(objs));
   });
 };
@@ -80,7 +80,7 @@ common.loadFilesSync = function (files) {
   var options = Array.isArray(files) ? { files: files } : files;
   options.format = options.format || formats.json;
 
-  return common.merge(files.map(function (file) {
+  return common.merge(options.files.map(function (file) {
     return options.format.parse(fs.readFileSync(file, 'utf8'));
   }));
 };