(bug 12430 and http://lists.wikimedia.org/pipermail/mediawiki-l/2008-March/026443...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 222b23a..c6ae9bc 100644 (file)
--- 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 2c269b3..36d8b25 100644 (file)
--- 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 );