From: Iskren Chernev <iskren.chernev@gmail.com>
Date: Wed, 23 Dec 2015 04:38:42 +0000 (-0800)
Subject: Fix forgotten merge note in #2646
X-Git-Tag: 2.11.0~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0897f50b38e94fb397cc10239c46767c4095ce3e;p=thirdparty%2Fmoment.git

Fix forgotten merge note in #2646
---

diff --git a/src/lib/create/date-from-array.js b/src/lib/create/date-from-array.js
index 98cd94109..180f55c71 100644
--- a/src/lib/create/date-from-array.js
+++ b/src/lib/create/date-from-array.js
@@ -4,7 +4,7 @@ export function createDate (y, m, d, h, M, s, ms) {
     var date = new Date(y, m, d, h, M, s, ms);
 
     //the date constructor remaps years 0-99 to 1900-1999
-    if (y < 100 && y >= 0 && isFinite(date.getYear())) {
+    if (y < 100 && y >= 0 && isFinite(date.getFullYear())) {
         date.setFullYear(y);
     }
     return date;