[MediaWiki-commits] [Gerrit] Remove unnecessary checks for MW_SUPPORTS_CONTENTHANDLER - change (mediawiki...AbuseFilter)

2015-11-23 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove unnecessary checks for MW_SUPPORTS_CONTENTHANDLER
..


Remove unnecessary checks for MW_SUPPORTS_CONTENTHANDLER

This extensions already requires 1.23+

Change-Id: Ib8c718915a8568c0461e0a386ac0cdb7e56bbf51
---
M AbuseFilterVariableHolder.php
1 file changed, 4 insertions(+), 12 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/AbuseFilterVariableHolder.php b/AbuseFilterVariableHolder.php
index 6b17370..5c816c5 100644
--- a/AbuseFilterVariableHolder.php
+++ b/AbuseFilterVariableHolder.php
@@ -371,10 +371,7 @@
$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 @@
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 @@
$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 @@
$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.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8c718915a8568c0461e0a386ac0cdb7e56bbf51
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Se4598 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove unnecessary checks for MW_SUPPORTS_CONTENTHANDLER - change (mediawiki...AbuseFilter)

2015-11-23 Thread Nikerabbit (Code Review) 
Nikerabbit has uploaded a new change for review.

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

Change subject: Remove unnecessary checks for MW_SUPPORTS_CONTENTHANDLER
..

Remove unnecessary checks for MW_SUPPORTS_CONTENTHANDLER

This extensions already requires 1.23+

Change-Id: Ib8c718915a8568c0461e0a386ac0cdb7e56bbf51
---
M AbuseFilterVariableHolder.php
1 file changed, 4 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/25/254825/1

diff --git a/AbuseFilterVariableHolder.php b/AbuseFilterVariableHolder.php
index 6b17370..5c816c5 100644
--- a/AbuseFilterVariableHolder.php
+++ b/AbuseFilterVariableHolder.php
@@ -371,10 +371,7 @@
$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 @@
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 @@
$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 @@
$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.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8c718915a8568c0461e0a386ac0cdb7e56bbf51
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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