X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FcleanupSpam.php;h=98385694b33e49a46f3135eb4c5f084ed976e0c0;hb=e34865144f3f21bb8b0ad4ba76d3d10490a73462;hp=42d8440e6b99279d649c1ebf5bbd01e9ceead1f4;hpb=1f086ddbfb9c39a387c0d864128b802a8e2d0e9e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/cleanupSpam.php b/maintenance/cleanupSpam.php
index 42d8440e6b..98385694b3 100644
--- a/maintenance/cleanupSpam.php
+++ b/maintenance/cleanupSpam.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to cleanup all spam from a given hostname.
@@ -41,7 +41,7 @@ class CleanupSpam extends Maintenance {
 	public function execute() {
 		global $wgLocalDatabases, $wgUser;
 
-		$username = wfMsg( 'spambot_username' );
+		$username = wfMessage( 'spambot_username' )->text();
 		$wgUser = User::newFromName( $username );
 		if ( !$wgUser ) {
 			$this->error( "Invalid username", true );
@@ -103,7 +103,8 @@ class CleanupSpam extends Maintenance {
 		$rev = Revision::newFromTitle( $title );
 		$currentRevId = $rev->getId();
 
-		while ( $rev && ( $rev->isDeleted( Revision::DELETED_TEXT ) || LinkFilter::matchEntry( $rev->getText() , $domain ) ) ) {
+		while ( $rev && ( $rev->isDeleted( Revision::DELETED_TEXT )
+						|| LinkFilter::matchEntry( $rev->getContent( Revision::RAW ), $domain ) ) ) {
 			$rev = $rev->getPrevious();
 		}
 
@@ -117,17 +118,22 @@ class CleanupSpam extends Maintenance {
 			$page = WikiPage::factory( $title );
 			if ( $rev ) {
 				// Revert to this revision
+				$content = $rev->getContent( Revision::RAW );
+
 				$this->output( "reverting\n" );
-				$page->doEdit( $rev->getText(), wfMsgForContent( 'spam_reverting', $domain ),
+				$page->doEditContent( $content, wfMessage( 'spam_reverting', $domain )->inContentLanguage()->text(),
 					EDIT_UPDATE, $rev->getId() );
 			} elseif ( $this->hasOption( 'delete' ) ) {
 				// Didn't find a non-spammy revision, blank the page
 				$this->output( "deleting\n" );
-				$page->doDeleteArticle( wfMsgForContent( 'spam_deleting', $domain ) );
+				$page->doDeleteArticle( wfMessage( 'spam_deleting', $domain )->inContentLanguage()->text() );
 			} else {
 				// Didn't find a non-spammy revision, blank the page
+				$handler = ContentHandler::getForTitle( $title );
+				$content = $handler->makeEmptyContent();
+
 				$this->output( "blanking\n" );
-				$page->doEdit( '', wfMsgForContent( 'spam_blanking', $domain ) );
+				$page->doEditContent( $content, wfMessage( 'spam_blanking', $domain )->inContentLanguage()->text() );
 			}
 			$dbw->commit( __METHOD__ );
 		}