MediaWiki 1.17.0

[autoinstalls/mediawiki.git] / maintenance / purgeOldText.inc

diff --git a/maintenance/purgeOldText.inc b/maintenance/purgeOldText.inc
index e41c374db27b6b99c40d4f7667f719f53b2a8cca..381d62a7fc28e93527b156641e7bc41d9f814199 100644 (file)
--- a/maintenance/purgeOldText.inc
+++ b/maintenance/purgeOldText.inc
@@ -9,54 +9,54 @@
  */
 
 function PurgeRedundantText( $delete = false ) {
-       
+
        # Data should come off the master, wrapped in a transaction
        $dbw = wfGetDB( DB_MASTER );
        $dbw->begin();
-       
+
        $tbl_arc = $dbw->tableName( 'archive' );
        $tbl_rev = $dbw->tableName( 'revision' );
        $tbl_txt = $dbw->tableName( 'text' );
-       
+
        # Get "active" text records from the revisions table
        echo( "Searching for active text records in revisions table..." );
-       $res = $dbw->query( "SELECT DISTINCTROW rev_text_id FROM $tbl_rev" );
-       while( $row = $dbw->fetchObject( $res ) ) {
+       $res = $dbw->query( "SELECT DISTINCT rev_text_id FROM $tbl_rev" );
+       foreach ( $res as $row ) {
                $cur[] = $row->rev_text_id;
        }
        echo( "done.\n" );
-       
+
        # Get "active" text records from the archive table
        echo( "Searching for active text records in archive table..." );
-       $res = $dbw->query( "SELECT DISTINCTROW ar_text_id FROM $tbl_arc" );
-       while( $row = $dbw->fetchObject( $res ) ) {
+       $res = $dbw->query( "SELECT DISTINCT ar_text_id FROM $tbl_arc" );
+       foreach ( $res as $row ) {
                $cur[] = $row->ar_text_id;
        }
        echo( "done.\n" );
-       
+
        # Get the IDs of all text records not in these sets
        echo( "Searching for inactive text records..." );
        $set = implode( ', ', $cur );
        $res = $dbw->query( "SELECT old_id FROM $tbl_txt WHERE old_id NOT IN ( $set )" );
        $old = array();
-       while( $row = $dbw->fetchObject( $res ) ) {
+       foreach ( $res as $row ) {
                $old[] = $row->old_id;
        }
        echo( "done.\n" );
-       
+
        # Inform the user of what we're going to do
        $count = count( $old );
        echo( "$count inactive items found.\n" );
-       
+
        # Delete as appropriate
-       if( $delete && $count ) {
+       if ( $delete && $count ) {
                echo( "Deleting..." );
                $set = implode( ', ', $old );
                $dbw->query( "DELETE FROM $tbl_txt WHERE old_id IN ( $set )" );
                echo( "done.\n" );
        }
-       
+
        # Done
        $dbw->commit();
-       
+
 }