Merge branch 'master' into develop

This commit is contained in:
Lance Stout 2012-08-02 13:47:37 -07:00
commit f81d5e4bd6

View file

@ -94,6 +94,8 @@ class FeatureMechanisms(BasePlugin):
result[value] = self.xmpp.boundjid.user
elif value == 'password':
result[value] = creds['password']
elif value == 'authzid':
result[value] = creds.get('authzid', '')
elif value == 'email':
jid = self.xmpp.boundjid.bare
result[value] = creds.get('email', jid)