Merge pull request #11246 from ian-liu/email/Bug887700_cannot_load_em…

…ail_in_Inbox_after_OTA_updated Bug 887700 - [OTA] [Data Migration] [Email] Cannot load email in Inbox after update from v1.0.1 to v1.1.0. r=asuth
mozilla-b2g · Jul 30, 2013 · 2d9ee5a · 2d9ee5a
2 parents cb87fd8 + ddf6684
commit 2d9ee5a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/email/js/ext/mailapi/activesync/protocollayer.js b/apps/email/js/ext/mailapi/activesync/protocollayer.js
@@ -2876,7 +2876,7 @@
       // Build the URL parameters.
       var params = [
         ['Cmd', aCommand],
-        ['User', this._email],
+        ['User', this._username],
         ['DeviceId', this._deviceId],
         ['DeviceType', this._deviceType]
       ];

diff --git a/apps/email/js/ext/mailapi/main-frame-setup.js b/apps/email/js/ext/mailapi/main-frame-setup.js
@@ -540,7 +540,7 @@ var ContactCache = exports.ContactCache = {
   },
 
   resolvePeeps: function(addressPairs) {
-    if (addressPairs === null)
+    if (addressPairs == null)
       return null;
     var resolved = [];
     for (var i = 0; i < addressPairs.length; i++) {