From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sun, 2 Mar 2008 20:16:42 +0000 (+0000)
Subject: (bug 12430 and http://lists.wikimedia.org/pipermail/mediawiki-l/2008-March/026443... 
X-Git-Tag: 1.31.0-rc.0~49284
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22sites_tous%22%29%20.%20%22?a=commitdiff_plain;h=088999eeacc414494efbcc71c3915580a216bee9;p=lhc%2Fweb%2Fwiklou.git

(bug 12430 and lists.wikimedia.org/pipermail/mediawiki-l/2008-March/026443.html) Fix call to private method LinkFilter::makeRegex() fatal error in maintenance/cleanupSpam.php.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 222b23ad01..c6ae9bc600 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -59,6 +59,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13031) Add links to user pages in e-mail form
 * (bug 13147) Description for categoriespagetext (used in Special:Categories) reworded
 * (bug 11561) Fix fatal error when calling action=revert to non-image page
+* (bug 12430) Fix call to private method LinkFilter::makeRegex fatal error in
+  maintenance/cleanupSpam.php
 
 === API changes in 1.13 ===
 
diff --git a/maintenance/cleanupSpam.php b/maintenance/cleanupSpam.php
index 2c269b34b0..36d8b258a8 100644
--- a/maintenance/cleanupSpam.php
+++ b/maintenance/cleanupSpam.php
@@ -14,9 +14,8 @@ function cleanupArticle( $id, $domain ) {
 	$rev = Revision::newFromTitle( $title );
 	$revId = $rev->getId();
 	$currentRevId = $revId;
-	$regex = LinkFilter::makeRegex( $domain );
 	
-	while ( $rev && preg_match( $regex, $rev->getText() ) ) {
+	while ( $rev && LinkFilter::matchEntry( $rev->getText() , $domain ) ) {
 		# Revision::getPrevious can't be used in this way before MW 1.6 (Revision.php 1.26)
 		#$rev = $rev->getPrevious();
 		$revId = $title->getPreviousRevisionID( $revId );