fixing a possible bug with the current week year, and also a touch of cleanup

diff --git a/moment.js b/moment.js
index 3857ada680ce0bd8a913e7ad5a37073d32bc1697..76ca480caa06ab2d2fc13571cc0f7449046e9093 100644 (file)
--- a/moment.js
+++ b/moment.js
@@ -1093,7 +1093,7 @@
                 return val ?
                   (val.length < 3 ? (parseInt(val, 10) > 68 ? '19' + val : '20' + val) : val) :
                   (config._a[YEAR] != null ? currentDate[YEAR] :
-                    (config._a[YEAR] == null ? currentDate[YEAR] : config._a[YEAR]));
+                    (config._a[YEAR] == null ? moment().weekYear() : config._a[YEAR]));
             };
 
             w = config._w;
@@ -1477,9 +1477,6 @@
         if (moment.isMoment(input)) {
             config = extend({}, input);
 
-            //null this out to prevent infinite loops
-            config._w = null;
-
             config._d = new Date(+input._d);
         } else if (format) {
             if (isArray(format)) {