wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-09-24 10:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary checks for MW_SUPPORTS_CONTENTHANDLER

Browse source 
This extensions already requires 1.23+

Change-Id: Ib8c718915a8568c0461e0a386ac0cdb7e56bbf51
This commit is contained in:
Niklas Laxström 2015-11-23 11:02:53 +01:00
parent b4748f25ad
commit 1399ca02be
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
AbuseFilterVariableHolder.php
View file

@ -371,10 +371,7 @@ class AFComputedVariable {
$parameters['title']
);
}
if (
!defined( 'MW_SUPPORTS_CONTENTHANDLER' ) ||
$article->getContentModel() === CONTENT_MODEL_WIKITEXT
) {
if ( $article->getContentModel() === CONTENT_MODEL_WIKITEXT ) {
$textVar = $parameters['text-var'];
// XXX: Use prepareContentForEdit. But we need a Content object for that.
@ -397,8 +394,7 @@ class AFComputedVariable {
if ( $vars->getVar( 'context' )->toString() == 'filter' ) {
$links = $this->getLinksFromDB( $article );
wfDebug( "AbuseFilter: loading old links from DB\n" );
} elseif ( !defined( 'MW_SUPPORTS_CONTENTHANDLER' )
|| $article->getContentModel() === CONTENT_MODEL_WIKITEXT ) {
} elseif ( $article->getContentModel() === CONTENT_MODEL_WIKITEXT ) {
wfDebug( "AbuseFilter: loading old links from Parser\n" );
$textVar = $parameters['text-var'];
@ -443,10 +439,7 @@ class AFComputedVariable {
$parameters['title']
);
}
if (
!defined( 'MW_SUPPORTS_CONTENTHANDLER' ) ||
$article->getContentModel() === CONTENT_MODEL_WIKITEXT
) {
if ( $article->getContentModel() === CONTENT_MODEL_WIKITEXT ) {
$textVar = $parameters['wikitext-var'];
// XXX: Use prepareContentForEdit. But we need a Content object for that.
@ -468,8 +461,7 @@ class AFComputedVariable {
$article = self::articleFromTitle( $parameters['namespace'], $parameters['title'] );
$textVar = $parameters['wikitext-var'];
if ( !defined( 'MW_SUPPORTS_CONTENTHANDLER' )
|| $article->getContentModel() === CONTENT_MODEL_WIKITEXT ) {
if ( $article->getContentModel() === CONTENT_MODEL_WIKITEXT ) {
if ( isset( $parameters['pst'] ) && $parameters['pst'] ) {
// $textVar is already PSTed when it's not loaded from an ongoing edit.