No-L has uploaded a new change for review. https://gerrit.wikimedia.org/r/89148
Change subject: fixes getDomain() for UseLocal = true; ...................................................................... fixes getDomain() for UseLocal = true; getDomain() didn't return 'local' if there was only one DomainName defined. Change-Id: I0613c117735c26cbfc7fadc2962db93fc5c1883b --- M LdapAuthentication.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LdapAuthentication refs/changes/48/89148/1 diff --git a/LdapAuthentication.php b/LdapAuthentication.php index 6cb2ba9..27c9166 100644 --- a/LdapAuthentication.php +++ b/LdapAuthentication.php @@ -1154,7 +1154,7 @@ # The bugs will still exist when using multiple domains, # though. $domainNames = $this->getConf( 'DomainNames' ); - if ( count( $domainNames ) === 1 ) { + if ( ( count( $domainNames ) === 1 ) && !$this->getConf( 'UseLocal' ) ) { return $domainNames[0]; } # First check if we already have a valid domain set -- To view, visit https://gerrit.wikimedia.org/r/89148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0613c117735c26cbfc7fadc2962db93fc5c1883b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LdapAuthentication Gerrit-Branch: master Gerrit-Owner: No-L <n...@hadiko.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits