Merge "Remove pre-authmanager code"

This commit is contained in:
jenkins-bot 2017-10-12 07:29:21 +00:00 committed by Gerrit Code Review
commit 90347adaad

View file

@ -510,13 +510,7 @@ class EchoHooks {
* @return bool
*/
private static function isEmailChangeAllowed() {
global $wgAuth, $wgDisableAuthManager;
if ( class_exists( AuthManager::class ) && !$wgDisableAuthManager ) {
return AuthManager::singleton()->allowsPropertyChange( 'emailaddress' );
} else {
return $wgAuth->allowPropChange( 'emailaddress' );
}
return AuthManager::singleton()->allowsPropertyChange( 'emailaddress' );
}
/**