[MediaWiki-commits] [Gerrit] Remove unnecessary check 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 check for MW_SUPPORTS_CONTENTHANDLER
..


Remove unnecessary check for MW_SUPPORTS_CONTENTHANDLER

This extension already requires 1.23+

Change-Id: Id9f0c44cdd55ec024eb9cacb4d5b6e02546aea07
---
M AbuseFilter.class.php
1 file changed, 6 insertions(+), 9 deletions(-)

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



diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index 529beac..76de886 100755
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -2204,16 +2204,13 @@
if ( !$revision instanceof Revision ) {
return '';
}
-   if ( defined( 'MW_SUPPORTS_CONTENTHANDLER' ) ) {
-   $content = $revision->getContent( $audience );
-   if ( $content === null ) {
-   return '';
-   }
-   $result = self::contentToString( $content );
-   } else {
-   // For MediaWiki without contenthandler support (< 1.21)
-   $result = $revision->getText();
+
+   $content = $revision->getContent( $audience );
+   if ( $content === null ) {
+   return '';
}
+   $result = self::contentToString( $content );
+
return $result;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9f0c44cdd55ec024eb9cacb4d5b6e02546aea07
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 check 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 check for MW_SUPPORTS_CONTENTHANDLER
..


Remove unnecessary check for MW_SUPPORTS_CONTENTHANDLER

This extension already requires 1.23+

Change-Id: Ie23339ffeaf6d6a9613b1b9c3929db0bccae65c8
---
M AbuseFilter.hooks.php
1 file changed, 2 insertions(+), 6 deletions(-)

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



diff --git a/AbuseFilter.hooks.php b/AbuseFilter.hooks.php
index 4758042..c6bac7a 100755
--- a/AbuseFilter.hooks.php
+++ b/AbuseFilter.hooks.php
@@ -122,12 +122,8 @@
return true;
}
 
-   if ( defined( 'MW_SUPPORTS_CONTENTHANDLER' ) ) {
-   $oldcontent = $revision->getContent( 
Revision::RAW );
-   $oldtext = AbuseFilter::contentToString( 
$oldcontent );
-   } else {
-   $oldtext = AbuseFilter::revisionToString( 
$revision, Revision::RAW );
-   }
+   $oldcontent = $revision->getContent( Revision::RAW );
+   $oldtext = AbuseFilter::contentToString( $oldcontent );
 
// Cache article object so we can share a parse 
operation
$articleCacheKey = $title->getNamespace() . ':' . 
$title->getText();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie23339ffeaf6d6a9613b1b9c3929db0bccae65c8
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 check 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/254823

Change subject: Remove unnecessary check for MW_SUPPORTS_CONTENTHANDLER
..

Remove unnecessary check for MW_SUPPORTS_CONTENTHANDLER

This extension already requires 1.23+

Change-Id: Ie23339ffeaf6d6a9613b1b9c3929db0bccae65c8
---
M AbuseFilter.hooks.php
1 file changed, 2 insertions(+), 6 deletions(-)


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

diff --git a/AbuseFilter.hooks.php b/AbuseFilter.hooks.php
index 4758042..c6bac7a 100755
--- a/AbuseFilter.hooks.php
+++ b/AbuseFilter.hooks.php
@@ -122,12 +122,8 @@
return true;
}
 
-   if ( defined( 'MW_SUPPORTS_CONTENTHANDLER' ) ) {
-   $oldcontent = $revision->getContent( 
Revision::RAW );
-   $oldtext = AbuseFilter::contentToString( 
$oldcontent );
-   } else {
-   $oldtext = AbuseFilter::revisionToString( 
$revision, Revision::RAW );
-   }
+   $oldcontent = $revision->getContent( Revision::RAW );
+   $oldtext = AbuseFilter::contentToString( $oldcontent );
 
// Cache article object so we can share a parse 
operation
$articleCacheKey = $title->getNamespace() . ':' . 
$title->getText();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie23339ffeaf6d6a9613b1b9c3929db0bccae65c8
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

[MediaWiki-commits] [Gerrit] Remove unnecessary check 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/254824

Change subject: Remove unnecessary check for MW_SUPPORTS_CONTENTHANDLER
..

Remove unnecessary check for MW_SUPPORTS_CONTENTHANDLER

This extension already requires 1.23+

Change-Id: Id9f0c44cdd55ec024eb9cacb4d5b6e02546aea07
---
M AbuseFilter.class.php
1 file changed, 6 insertions(+), 9 deletions(-)


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

diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index 529beac..76de886 100755
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -2204,16 +2204,13 @@
if ( !$revision instanceof Revision ) {
return '';
}
-   if ( defined( 'MW_SUPPORTS_CONTENTHANDLER' ) ) {
-   $content = $revision->getContent( $audience );
-   if ( $content === null ) {
-   return '';
-   }
-   $result = self::contentToString( $content );
-   } else {
-   // For MediaWiki without contenthandler support (< 1.21)
-   $result = $revision->getText();
+
+   $content = $revision->getContent( $audience );
+   if ( $content === null ) {
+   return '';
}
+   $result = self::contentToString( $content );
+
return $result;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9f0c44cdd55ec024eb9cacb4d5b6e02546aea07
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