Allow extensions to add pages with non-wikitext display by adding two new

[lhc/web/wiklou.git] / maintenance / deleteOldRevisions.php

diff --git a/maintenance/deleteOldRevisions.php b/maintenance/deleteOldRevisions.php
index 6eb1869..2cb347f 100644 (file)
--- a/maintenance/deleteOldRevisions.php
+++ b/maintenance/deleteOldRevisions.php
@@ -31,24 +31,24 @@ class DeleteOldRevisions extends Maintenance {
                $this->addOption( 'delete', 'Actually perform the deletion' );
                $this->addOption( 'page_id', 'List of page ids to work on', false );
        }
-       
+
        public function execute() {
                $this->output( "Delete old revisions\n\n" );
                $this->doDelete( $this->hasOption( 'delete' ), $this->mArgs );
        }
-       
+
        function doDelete( $delete = false, $args = array() ) {
 
                # Data should come off the master, wrapped in a transaction
                $dbw = wfGetDB( DB_MASTER );
                $dbw->begin();
-       
+
                $tbl_pag = $dbw->tableName( 'page' );
                $tbl_rev = $dbw->tableName( 'revision' );
-       
+
                $pageIdClause = '';
                $revPageClause = '';
-       
+
                # If a list of page_ids was provided, limit results to that set of page_ids
                if ( sizeof( $args ) > 0 ) {
                        $pageIdList = implode( ',', $args );
@@ -56,15 +56,16 @@ class DeleteOldRevisions extends Maintenance {
                        $revPageClause = " AND rev_page IN ({$pageIdList})";
                        $this->output( "Limiting to {$tbl_pag}.page_id IN ({$pageIdList})\n" );
                }
-       
+
                # Get "active" revisions from the page table
                $this->output( "Searching for active revisions..." );
                $res = $dbw->query( "SELECT page_latest FROM $tbl_pag{$pageIdClause}" );
+               $cur = array();
                foreach ( $res as $row ) {
                        $cur[] = $row->page_latest;
                }
                $this->output( "done.\n" );
-       
+
                # Get all revisions that aren't in this set
                $old = array();
                $this->output( "Searching for inactive revisions..." );
@@ -74,11 +75,11 @@ class DeleteOldRevisions extends Maintenance {
                        $old[] = $row->rev_id;
                }
                $this->output( "done.\n" );
-       
+
                # Inform the user of what we're going to do
                $count = count( $old );
                $this->output( "$count old revisions found.\n" );
-       
+
                # Delete as appropriate
                if ( $delete && $count ) {
                        $this->output( "Deleting..." );
@@ -86,7 +87,7 @@ class DeleteOldRevisions extends Maintenance {
                        $dbw->query( "DELETE FROM $tbl_rev WHERE rev_id IN ( $set )" );
                        $this->output( "done.\n" );
                }
-       
+
                # This bit's done
                # Purge redundant text records
                $dbw->commit();
@@ -97,5 +98,5 @@ class DeleteOldRevisions extends Maintenance {
 }
 
 $maintClass = "DeleteOldRevisions";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );