Revert "simplifying diff. Fixes #1227"

This reverts commit f4376a3e646802be099d90cd2aa20fd2123a6fc9.

diff --git a/moment.js b/moment.js
index da5ba16b63101d7923bfbd697cd47d666d85d8eb..0e87facfe8bb4f6af161d529988cb7c514efca03 100644 (file)
--- 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;