Merge branch 'master' of github.com:emmanuel-florent/converse.js into emmflorent

ed3be373 · JC Brand · 21a3b440 · fdfd98ac · ed3be373
Commit ed3be373 authored Jun 22, 2015 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

converse.js converse.js +2 -2

No files found.
--- a/converse.js
+++ b/converse.js
@@ -4052,8 +4052,8 @@
                if (contact instanceof converse.RosterContact) {
                    contact.authorize().subscribe();
                } else {
-                    // XXX: I don't think this should ever happen
-                    this.addContact(jid, '', [], { 'subscription': 'from' }).done(function (contact) {
+                    // XXX: Happen when subscription retries or roster deleted
+                    this.addContact(bare_jid, '', [], { 'subscription': 'from' }).done(function (contact) {
                        if (contact instanceof converse.RosterContact) {
                            contact.authorize().subscribe();
                        }