Fixing bug 20524: Hideuser: Nicer error when trying to block hidden user without...

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

diff --git a/maintenance/deleteOldRevisions.php b/maintenance/deleteOldRevisions.php
index 6b140fa..917f1ba 100644 (file)
--- a/maintenance/deleteOldRevisions.php
+++ b/maintenance/deleteOldRevisions.php
@@ -22,7 +22,7 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-require_once( "Maintenance.php" );
+require_once( dirname(__FILE__) . '/Maintenance.php' );
 
 class DeleteOldRevisions extends Maintenance {
        public function __construct() {
@@ -34,7 +34,7 @@ class DeleteOldRevisions extends Maintenance {
        public function execute() {
                $this->output( "Delete old revisions\n\n" );
                if( count( $this->mArgs ) < 1 ) {
-                       $this->error( "Must pass at least 1 page_id\n", true );
+                       $this->error( "Must pass at least 1 page_id", true );
                }
                $this->doDelete( $this->hasOption( 'delete' ), $this->mArgs );
        }
@@ -62,7 +62,7 @@ class DeleteOldRevisions extends Maintenance {
                # Get "active" revisions from the page table
                $this->output( "Searching for active revisions..." );
                $res = $dbw->query( "SELECT page_latest FROM $tbl_pag{$pageIdClause}" );
-               while( $row = $dbw->fetchObject( $res ) ) {
+               foreach( $res as $row ) {
                        $cur[] = $row->page_latest;
                }
                $this->output( "done.\n" );
@@ -71,7 +71,7 @@ class DeleteOldRevisions extends Maintenance {
                $this->output( "Searching for inactive revisions..." );
                $set = implode( ', ', $cur );
                $res = $dbw->query( "SELECT rev_id FROM $tbl_rev WHERE rev_id NOT IN ( $set ){$revPageClause}" );
-               while( $row = $dbw->fetchObject( $res ) ) {
+               foreach( $res as $row ) {
                        $old[] = $row->rev_id;
                }
                $this->output( "done.\n" );