From: Iskren Chernev <iskren.chernev@gmail.com>
Date: Sat, 2 Nov 2013 17:00:56 +0000 (-0700)
Subject: Revert "simplifying diff. Fixes #1227"
X-Git-Tag: 2.5.0^2~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22e15cc1ac8e05b823f87c8bcc6bb076430bcd44;p=thirdparty%2Fmoment.git

Revert "simplifying diff. Fixes #1227"

This reverts commit f4376a3e646802be099d90cd2aa20fd2123a6fc9.
---

diff --git a/moment.js b/moment.js
index da5ba16b6..0e87facfe 100644
--- a/moment.js
+++ b/moment.js
@@ -1826,7 +1826,7 @@
         },
 
         diff : function (input, units, asFloat) {
-            var that = moment(input),
+            var that = this._isUTC ? moment(input).zone(this._offset || 0) : moment(input).local(),
                 zoneDiff = (this.zone() - that.zone()) * 6e4,
                 diff, output;