No jquery.ui for now.

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

diff --git a/maintenance/deleteOrphanedRevisions.php b/maintenance/deleteOrphanedRevisions.php
index 1447336..1146bef 100644 (file)
--- a/maintenance/deleteOrphanedRevisions.php
+++ b/maintenance/deleteOrphanedRevisions.php
@@ -24,7 +24,7 @@
  * @todo More efficient cleanup of text records
  */
 
-require_once( "Maintenance.php" );
+require_once( dirname(__FILE__) . '/Maintenance.php' );
 
 class DeleteOrphanedRevisions extends Maintenance {
        public function __construct() {
@@ -39,8 +39,8 @@ class DeleteOrphanedRevisions extends Maintenance {
                $report = $this->hasOption('report');
 
                $dbw = wfGetDB( DB_MASTER );
-               $dbw->immediateBegin();
-               list( $page, $revision ) = $dbw->tableNames( 'page', 'revision' );
+               $dbw->begin();
+               list( $page, $revision ) = $dbw->tableNamesN( 'page', 'revision' );
 
                # Find all the orphaned revisions
                $this->output( "Checking for orphaned revisions..." );
@@ -48,7 +48,8 @@ class DeleteOrphanedRevisions extends Maintenance {
                $res = $dbw->query( $sql, 'deleteOrphanedRevisions' );
        
                # Stash 'em all up for deletion (if needed)
-               while( $row = $dbw->fetchObject( $res ) )
+               $revisions = array();
+               foreach( $res as $row )
                        $revisions[] = $row->rev_id;
                $dbw->freeResult( $res );
                $count = count( $revisions );
@@ -56,7 +57,7 @@ class DeleteOrphanedRevisions extends Maintenance {
        
                # Nothing to do?
                if( $report || $count == 0 ) {
-                       $dbw->immediateCommit();
+                       $dbw->commit();
                        exit(0);
                }
        
@@ -66,7 +67,7 @@ class DeleteOrphanedRevisions extends Maintenance {
                $this->output( "done.\n" );
        
                # Close the transaction and call the script to purge unused text records
-               $dbw->immediateCommit();
+               $dbw->commit();
                $this->purgeRedundantText( true );
        }