Postgres uses TIMESTAMPTZ not DATETIME.

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

diff --git a/maintenance/orphans.php b/maintenance/orphans.php
index df4ba36..faaadd3 100644 (file)
--- a/maintenance/orphans.php
+++ b/maintenance/orphans.php
@@ -50,13 +50,14 @@ class Orphans extends Maintenance {
 
        /**
         * Lock the appropriate tables for the script
-        * @param $db Database object
+        * @param $db DatabaseBase object
         * @param $extraTable String The name of any extra tables to lock (eg: text)
         */
-       private function lockTables( &$db, $extraTable = null ) {
+       private function lockTables( $db, $extraTable = array() ) {
                $tbls = array( 'page', 'revision', 'redirect' );
-               if ( $extraTable )
-                       $tbls[] = $extraTable;
+               if ( $extraTable ) {
+                       $tbls = array_merge( $tbls, $extraTable );
+               }
                $db->lockTables( array(), $tbls, __METHOD__, false );
        }
 
@@ -68,11 +69,11 @@ class Orphans extends Maintenance {
                $dbw = wfGetDB( DB_MASTER );
                $page = $dbw->tableName( 'page' );
                $revision = $dbw->tableName( 'revision' );
-       
+
                if ( $fix ) {
                        $this->lockTables( $dbw );
                }
-       
+
                $this->output( "Checking for orphan revision table entries... (this may take a while on a large wiki)\n" );
                $result = $dbw->query( "
                        SELECT *
@@ -104,14 +105,14 @@ class Orphans extends Maintenance {
                } else {
                        $this->output( "No orphans! Yay!\n" );
                }
-       
+
                if ( $fix ) {
                        $dbw->unlockTables( __METHOD__ );
                }
        }
 
        /**
-        * @param $fix bool 
+        * @param $fix bool
         * @todo DON'T USE THIS YET! It will remove entries which have children,
         *       but which aren't properly attached (eg if page_latest is bogus
         *       but valid revisions do exist)
@@ -151,7 +152,7 @@ class Orphans extends Maintenance {
                } else {
                        $this->output( "No childless pages! Yay!\n" );
                }
-       
+
                if ( $fix ) {
                        $dbw->unlockTables( __METHOD__ );
                }
@@ -165,12 +166,11 @@ class Orphans extends Maintenance {
                $dbw = wfGetDB( DB_MASTER );
                $page     = $dbw->tableName( 'page' );
                $revision = $dbw->tableName( 'revision' );
-               $text     = $dbw->tableName( 'text' );
-       
+
                if ( $fix ) {
-                       $dbw->lockTables( $dbw, 'text' );
+                       $this->lockTables( $dbw, array( 'user', 'text' ) );
                }
-       
+
                $this->output( "\nChecking for pages whose page_latest links are incorrect... (this may take a while on a large wiki)\n" );
                $result = $dbw->query( "
                        SELECT *
@@ -207,7 +207,7 @@ class Orphans extends Maintenance {
                                                $this->output( "... updating to revision $maxId\n" );
                                                $maxRev = Revision::newFromId( $maxId );
                                                $title = Title::makeTitle( $row->page_namespace, $row->page_title );
-                                               $article = new Article( $title );
+                                               $article = WikiPage::factory( $title );
                                                $article->updateRevisionOn( $dbw, $maxRev );
                                        }
                                }
@@ -215,7 +215,7 @@ class Orphans extends Maintenance {
                                $this->output( "wtf\n" );
                        }
                }
-       
+
                if ( $found ) {
                        $this->output( "Found $found pages with incorrect latest revision.\n" );
                } else {
@@ -224,7 +224,7 @@ class Orphans extends Maintenance {
                if ( !$fix && $found > 0 ) {
                        $this->output( "Run again with --fix to remove these entries automatically.\n" );
                }
-       
+
                if ( $fix ) {
                        $dbw->unlockTables( __METHOD__ );
                }
@@ -232,4 +232,4 @@ class Orphans extends Maintenance {
 }
 
 $maintClass = "Orphans";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );