wikimedia/mediawiki-extensions-TitleBlacklist
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TitleBlacklist synced 2024-11-27 15:30:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use AntiSpoof::checkUnicodeStringStatus

Browse source 
Migrate from AntiSpoof::checkUnicodeString to the new function with
status object - was added in 1.32

Use ExtensionRegistry to check for extension
Add error message from the Status to the log

Change-Id: I5d79426a328c6ddc02789d795bc84599e8e5c06d
This commit is contained in:
Umherirrender 2020-02-29 10:59:56 +01:00
parent f7fc3bf68d
commit f03d6c617b
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
includes/TitleBlacklistEntry.php
View file

@ -101,27 +101,30 @@ class TitleBlacklistEntry {
}
if ( isset( $this->mParams['antispoof'] )
&& is_callable( 'AntiSpoof::checkUnicodeString' )
&& ExtensionRegistry::getInstance()->isLoaded( 'AntiSpoof' )
) {
if ( $action === 'edit' ) {
// Use process cache for frequently edited pages
$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
list( $ok, $norm ) = $cache->getWithSetCallback(
$status = $cache->getWithSetCallback(
$cache->makeKey( 'titleblacklist', 'normalized-unicode', md5( $title ) ),
$cache::TTL_MONTH,
function () use ( $title ) {
return AntiSpoof::checkUnicodeString( $title );
return AntiSpoof::checkUnicodeStringStatus( $title );
},
[ 'pcTTL' => $cache::TTL_PROC_LONG ]
);
} else {
list( $ok, $norm ) = AntiSpoof::checkUnicodeString( $title );
$status = AntiSpoof::checkUnicodeStringStatus( $title );
}
if ( $ok === "OK" ) {
list( , $title ) = explode( ':', $norm, 2 );
if ( $status->isOK() ) {
// Remove version from return value
list( , $title ) = explode( ':', $status->getValue(), 2 );
} else {
wfDebugLog( 'TitleBlacklist', 'AntiSpoof could not normalize "' . $title . '".' );
wfDebugLog( 'TitleBlacklist', 'AntiSpoof could not normalize "' . $title . '" ' .
$status->getMessage( false, false, 'en' )->text() . '.'
);
}
}