From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 28 Feb 2006 05:34:36 +0000 (+0000)
Subject: revert accidentally committed live hack
X-Git-Tag: 1.6.0~257
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=dd0930677f44bccf4b26a07a9a365b4831bc6feb;p=lhc%2Fweb%2Fwiklou.git

revert accidentally committed live hack
---

diff --git a/maintenance/cleanupSpam.php b/maintenance/cleanupSpam.php
index 65d6bc4d34..01b1f631cb 100644
--- a/maintenance/cleanupSpam.php
+++ b/maintenance/cleanupSpam.php
@@ -53,9 +53,6 @@ function cleanupArticle( $id, $domain ) {
 }
 //------------------------------------------------------------------------------
 
-
-
-
 $username = wfMsg( 'spambot_username' );
 $fname = $username;
 $wgUser = User::newFromName( $username );
@@ -77,36 +74,15 @@ if ( !$like ) {
 
 $dbr =& wfGetDB( DB_SLAVE );
 
-if ( $options['all'] ) {
-	// Clean up spam on all wikis
-	$dbr =& wfGetDB( DB_SLAVE );
-	print "Finding spam on " . count($wgLocalDatabases) . " wikis\n";
-	$found = false;
-	foreach ( $wgLocalDatabases as $db ) {
-		$count = $dbr->selectField( "`$db`.externallinks", 'COUNT(*)', 
-			array( 'el_index LIKE ' . $dbr->addQuotes( $like ) ), $fname );
-		if ( $count ) {
-			$found = true;
-			passthru( "php cleanupSpam.php $db $spec | sed s/^/$db:  /" );
-		}
-	}
-	if ( $found ) {
-		print "All done\n";
-	} else {
-		print "None found\n";
-	}
-} else {
-	// Clean up spam on this wiki
-	$res = $dbr->select( 'externallinks', array( 'DISTINCT el_from' ), 
-		array( 'el_index LIKE ' . $dbr->addQuotes( $like ) ), $fname );
-	$count = $dbr->numRows( $res );
-	print "Found $count articles containing $spec\n";
-	while ( $row = $dbr->fetchObject( $res ) ) {
-		cleanupArticle( $row->el_from, $spec );
-	}
-	if ( $count ) {
-		print "Done\n";
-	}
+$res = $dbr->select( 'externallinks', array( 'el_from' ), 
+	array( 'el_index LIKE ' . $dbr->addQuotes( $like ) ), $fname );
+$count = $dbr->numRows( $res );
+print "Found $count articles containing $spec\n";
+while ( $row = $dbr->fetchObject( $res ) ) {
+	cleanupArticle( $row->el_from, $spec );
+}
+if ( $count ) {
+	print "Done\n";
 }
 
 ?>
diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index f5b28d64ca..1d444c852b 100644
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -131,7 +131,6 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
 	$DP = $IP;
 	ini_set( 'include_path', ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );
 
-	require_once( $IP.'/includes/ProfilerStub.php' );
 	require_once( $IP.'/includes/Defines.php' );
 	require_once( $IP.'/CommonSettings.php' );
 
@@ -158,7 +157,6 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
 	}
 	$wgCommandLineMode = true;
 	$DP = $IP;
-	require_once( $IP.'/includes/ProfilerStub.php' );
 	require_once( $IP.'/includes/Defines.php' );
 	require_once( $settingsFile );
 	ini_set( 'include_path', ".$sep$IP$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" );