Use makeAs in calendar too

diff --git a/moment.js b/moment.js
index c29b111b787e2e66c9a35960349c034d950dbae2..87e0380dbc7241314012533e5eb3a353d91d9636 100644 (file)
--- a/moment.js
+++ b/moment.js
@@ -1876,7 +1876,7 @@
         calendar : function () {
             // We want to compare the start of today, vs this.
             // Getting start-of-today depends on whether we're zone'd or not.
-            var sod = (this._isUTC ? moment().zone(this.zone()) : moment()).startOf('day'),
+            var sod = makeAs(moment(), this).startOf('day'),
                 diff = this.diff(sod, 'days', true),
                 format = diff < -6 ? 'sameElse' :
                     diff < -1 ? 'lastWeek' :