Fix #2335 (crash on /cycle with room without userpart)

This commit is contained in:
mathieui 2013-07-29 19:31:33 +02:00
parent d64a95bd3b
commit cbcac03510
2 changed files with 9 additions and 10 deletions

View file

@ -66,8 +66,7 @@ def change_nick(core, jid, nick, status=None, show=None):
def join_groupchat(core, jid, nick, passwd='', maxhistory=None, status=None, show=None, seconds=0): def join_groupchat(core, jid, nick, passwd='', maxhistory=None, status=None, show=None, seconds=0):
xmpp = core.xmpp xmpp = core.xmpp
jid = safeJID(jid) stanza = xmpp.makePresence(pto='%s/%s' % (jid, nick), pstatus=status, pshow=show)
stanza = xmpp.makePresence(pto="%s/%s" % (jid, nick), pstatus=status, pshow=show)
x = ET.Element('{http://jabber.org/protocol/muc}x') x = ET.Element('{http://jabber.org/protocol/muc}x')
if passwd: if passwd:
passelement = ET.Element('password') passelement = ET.Element('password')