Merge branch 'master' of github.com:emmanuel-florent/converse.js into emmflorent
This commit is contained in:
commit
ed3be3730c
|
@ -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();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user