Merge branch 'master' into develop

This commit is contained in:
Lance Stout 2013-01-16 23:37:05 -08:00
commit 648f3f978a

View file

@ -79,7 +79,7 @@ class XEP_0153(BasePlugin):
def _start(self, event):
try:
vcard = self.xmpp['xep_0054'].get_vcard()
vcard = self.xmpp['xep_0054'].get_vcard(self.xmpp.boundjid.bare)
data = vcard['vcard_temp']['PHOTO']['BINVAL']
if not data:
new_hash = ''