X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcleanupSpam.php;h=020f5cd75b8986fffe3e3b794a390ead07247ba1;hb=7489189d7c13448114963520fb383cb2c7765b1e;hp=f4a5147a56c3c3df3a2d81afebea6d87ed746cc4;hpb=0b7f75739786a44feab8eca1a9ec21b72e3bb2cc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/cleanupSpam.php b/maintenance/cleanupSpam.php
index f4a5147a56..020f5cd75b 100644
--- a/maintenance/cleanupSpam.php
+++ b/maintenance/cleanupSpam.php
@@ -32,7 +32,7 @@ class CleanupSpam extends Maintenance {
 
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "Cleanup all spam from a given hostname";
+		$this->addDescription( 'Cleanup all spam from a given hostname' );
 		$this->addOption( 'all', 'Check all wikis in $wgLocalDatabases' );
 		$this->addOption( 'delete', 'Delete pages containing only spam instead of blanking them' );
 		$this->addArg(
@@ -45,7 +45,7 @@ class CleanupSpam extends Maintenance {
 		global $IP, $wgLocalDatabases, $wgUser;
 
 		$username = wfMessage( 'spambot_username' )->text();
-		$wgUser = User::newFromName( $username );
+		$wgUser = User::newSystemUser( $username );
 		if ( !$wgUser ) {
 			$this->error( "Invalid username specified in 'spambot_username' message: $username", true );
 		}
@@ -64,7 +64,7 @@ class CleanupSpam extends Maintenance {
 			$this->output( "Finding spam on " . count( $wgLocalDatabases ) . " wikis\n" );
 			$found = false;
 			foreach ( $wgLocalDatabases as $wikiID ) {
-				$dbr = wfGetDB( DB_SLAVE, array(), $wikiID );
+				$dbr = $this->getDB( DB_SLAVE, array(), $wikiID );
 
 				$count = $dbr->selectField( 'externallinks', 'COUNT(*)',
 					array( 'el_index' . $dbr->buildLike( $like ) ), __METHOD__ );
@@ -83,7 +83,7 @@ class CleanupSpam extends Maintenance {
 		} else {
 			// Clean up spam on this wiki
 
-			$dbr = wfGetDB( DB_SLAVE );
+			$dbr = $this->getDB( DB_SLAVE );
 			$res = $dbr->select( 'externallinks', array( 'DISTINCT el_from' ),
 				array( 'el_index' . $dbr->buildLike( $like ) ), __METHOD__ );
 			$count = $dbr->numRows( $res );
@@ -120,8 +120,8 @@ class CleanupSpam extends Maintenance {
 			// This happens e.g. when a link comes from a template rather than the page itself
 			$this->output( "False match\n" );
 		} else {
-			$dbw = wfGetDB( DB_MASTER );
-			$dbw->begin( __METHOD__ );
+			$dbw = $this->getDB( DB_MASTER );
+			$this->beginTransaction( $dbw, __METHOD__ );
 			$page = WikiPage::factory( $title );
 			if ( $rev ) {
 				// Revert to this revision
@@ -151,7 +151,7 @@ class CleanupSpam extends Maintenance {
 					wfMessage( 'spam_blanking', $domain )->inContentLanguage()->text()
 				);
 			}
-			$dbw->commit( __METHOD__ );
+			$this->commitTransaction( $dbw, __METHOD__ );
 		}
 	}
 }