MarkAHershberger has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348100 )
Change subject: email fix
......................................................................
email fix
Change-Id: I920841ebdb55b3a2ca4a71737d930b889f59786a
---
M src/LdapGroups.php
1 file changed, 7 insertions(+), 4 deletions(-)
Approvals:
MarkAHershberger: Verified; Looks good to me, approved
diff --git a/src/LdapGroups.php b/src/LdapGroups.php
index 812f6d9..3b78b0a 100644
--- a/src/LdapGroups.php
+++ b/src/LdapGroups.php
@@ -157,10 +157,13 @@
public function fetchLDAPData( User $user ) {
$email = $user->getEmail();
-
- if( !$email ) {
- // Fail early
- throw new MWException( "No email found for $user" );
+ if ( !$email ) {
+ \Hooks::run( 'PluggableSSOEmail', [ &$email ] );
+ if( !$email ) {
+ // Fail early
+ throw new MWException( "No email found for
$user" );
+ }
+ $user->setEmail( $email );
}
wfDebug( __METHOD__ . ": Fetching user data for $user from
LDAP\n" );
$entry = $this->doLDAPSearch( $this->param['searchattr'] .
--
To view, visit https://gerrit.wikimedia.org/r/348100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I920841ebdb55b3a2ca4a71737d930b889f59786a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LdapGroups
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger <[email protected]>
Gerrit-Reviewer: MarkAHershberger <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
