Anomie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/294851

Change subject: Add $options parameter for testUserForCreation()
......................................................................

Add $options parameter for testUserForCreation()

Also use it to only log the title blacklist hit when running for real,
not when testing a username.

Change-Id: Ie9639a15d04b387be0e72754301eb6d91cd8adc2
---
M TitleBlacklistPreAuthenticationProvider.php
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TitleBlacklist 
refs/changes/51/294851/1

diff --git a/TitleBlacklistPreAuthenticationProvider.php 
b/TitleBlacklistPreAuthenticationProvider.php
index 19bd3c2..b2371ca 100644
--- a/TitleBlacklistPreAuthenticationProvider.php
+++ b/TitleBlacklistPreAuthenticationProvider.php
@@ -37,12 +37,14 @@
                return TitleBlacklistHooks::testUserName( $user->getName(), 
$creator, $override, true );
        }
 
-       public function testUserForCreation( $user, $autocreate ) {
+       public function testUserForCreation( $user, $autocreate, array $options 
= [] ) {
                $sv = StatusValue::newGood();
                $creator = RequestContext::getMain()->getUser();
 
-               if ( !$autocreate || $this->blockAutoAccountCreation ) {
-                       $sv->merge( TitleBlacklistHooks::testUserName( 
$user->getName(), $creator, true, true ) );
+               if ( !$autocreate && empty( $options['creating'] ) || 
$this->blockAutoAccountCreation ) {
+                       $sv->merge( TitleBlacklistHooks::testUserName(
+                               $user->getName(), $creator, true, 
(bool)$autocreate
+                       ) );
                }
                return $sv;
        }

-- 
To view, visit https://gerrit.wikimedia.org/r/294851
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9639a15d04b387be0e72754301eb6d91cd8adc2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TitleBlacklist
Gerrit-Branch: master
Gerrit-Owner: Anomie <bjor...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to