From: Stephen Bradshaw <stephen.bradshaw@thomsonreuters.com>
Date: Mon, 18 Nov 2013 15:43:06 +0000 (+0000)
Subject: Ensure module.config() returns an object
X-Git-Tag: 2.5.0^2~36^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1280%2Fhead;p=thirdparty%2Fmoment.git

Ensure module.config() returns an object
---

diff --git a/moment.js b/moment.js
index 3d7194001..3fe68bd8d 100644
--- a/moment.js
+++ b/moment.js
@@ -2304,7 +2304,7 @@
         makeGlobal(true);
     } else if (typeof define === "function" && define.amd) {
         define("moment", function (require, exports, module) {
-            if (module.config().noGlobal !== true) {
+            if (module.config() && module.config().noGlobal !== true) {
                 // If user provided noGlobal, he is aware of global
                 makeGlobal(module.config().noGlobal === undefined);
             }