From: Maggie Pint <maggiepint@gmail.com>
Date: Sat, 11 Jun 2016 14:47:43 +0000 (-0500)
Subject: fix passing date with format string to ignore format string
X-Git-Tag: 2.14.0~19^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b05b200e36afa12d74d880feec6d60c5946b6df;p=thirdparty%2Fmoment.git

fix passing date with format string to ignore format string
---

diff --git a/src/lib/create/from-anything.js b/src/lib/create/from-anything.js
index 022c6eb17..190a4f632 100644
--- a/src/lib/create/from-anything.js
+++ b/src/lib/create/from-anything.js
@@ -43,11 +43,11 @@ export function prepareConfig (config) {
         return new Moment(checkOverflow(input));
     } else if (isArray(format)) {
         configFromStringAndArray(config);
-    } else if (format) {
-        configFromStringAndFormat(config);
     } else if (isDate(input)) {
         config._d = input;
-    } else {
+    } else if (format) {
+        configFromStringAndFormat(config);
+    }  else {
         configFromInput(config);
     }
 
diff --git a/src/test/moment/create.js b/src/test/moment/create.js
index e6222fe24..95afe391a 100644
--- a/src/test/moment/create.js
+++ b/src/test/moment/create.js
@@ -72,6 +72,7 @@ test('unix', function (assert) {
 
 test('date', function (assert) {
     assert.ok(moment(new Date()).toDate() instanceof Date, 'new Date()');
+    assert.equal(moment(new Date(2016,0,1), 'YYYY-MM-DD').format('YYYY-MM-DD'), '2016-01-01', 'If date is provided, format string is ignored');
 });
 
 test('date mutation', function (assert) {