Merge remote-tracking branch 'origin/master' into 0.5.4-no-jsdom

* origin/master: fix edge case with non existing options.core
sourcejs · Aug 15, 2015 · eefcd8f · eefcd8f
2 parents 1b693b7 + ee85011
commit eefcd8f
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/core/loadOptions.js b/core/loadOptions.js
@@ -35,6 +35,7 @@ var legacyOptionsChecker = function(options, fileName){
     var haveCommon = options.core && options.core.common;
 
     // Server options
+    options.core = options.core || {};
     options.core.server = options.core.server || {};
     if (haveCommon && options.core.common.port) {
         if (!silent) legacyOptionsWarn('options.core.common.port', 'options.core.server.port', fileName);