Merge branch 'master' into develop
This commit is contained in:
		@@ -94,6 +94,8 @@ class FeatureMechanisms(BasePlugin):
 | 
				
			|||||||
                result[value] = self.xmpp.boundjid.user
 | 
					                result[value] = self.xmpp.boundjid.user
 | 
				
			||||||
            elif value == 'password':
 | 
					            elif value == 'password':
 | 
				
			||||||
                result[value] = creds['password']
 | 
					                result[value] = creds['password']
 | 
				
			||||||
 | 
					            elif value == 'authzid':
 | 
				
			||||||
 | 
					                result[value] = creds.get('authzid', '')
 | 
				
			||||||
            elif value == 'email':
 | 
					            elif value == 'email':
 | 
				
			||||||
                jid = self.xmpp.boundjid.bare
 | 
					                jid = self.xmpp.boundjid.bare
 | 
				
			||||||
                result[value] = creds.get('email', jid)
 | 
					                result[value] = creds.get('email', jid)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user