Merge pull request #25024 from arcturus/bug-1080008

Bug 1080008 - [Contacts] Importing contacts with special characters from Outlook do not appear correctly in contacts list. r=sergi
mozilla-b2g · Oct 10, 2014 · a95b616 · a95b616
2 parents 29c271e + e0043af
commit a95b616
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/shared/js/contacts/import/live/live_connector.js b/shared/js/contacts/import/live/live_connector.js
@@ -84,7 +84,10 @@ if (!window.LiveConnector) {
         out.uid = source.user_id || source.id;
         out.givenName = [source.first_name || ''];
         out.familyName = [source.last_name || ''];
-        out.email1 = source.emails.account || '';
+        out.email1 = source.emails.account ||
+         source.emails.preferred ||
+         source.emails.personal ||
+         '';
 
         out.contactPictureUri = [LIVE_ENDPOINT, out.uid,
                                  PICTURE_RESOURCE, '?type=medium'].join('');