Merge "(bug 17602) fix Monobook action tabs not quite touching the page body"

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

diff --git a/maintenance/orphans.php b/maintenance/orphans.php
index a82fa40..cdaba1c 100644 (file)
--- a/maintenance/orphans.php
+++ b/maintenance/orphans.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * Look for 'orphan' revisions hooked to pages which don't exist
- * And 'childless' pages with no revisions.
+ * Look for 'orphan' revisions hooked to pages which don't exist and
+ * 'childless' pages with no revisions.
  * Then, kill the poor widows and orphans.
  * Man this is depressing.
  *
- * Copyright (C) 2005 Brion Vibber <brion@pobox.com>
+ * Copyright © 2005 Brion Vibber <brion@pobox.com>
  * http://www.mediawiki.org/
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,17 +23,24 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @author <brion@pobox.com>
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
+/**
+ * Maintenance script that looks for 'orphan' revisions hooked to pages which
+ * don't exist and 'childless' pages with no revisions.
+ *
+ * @ingroup Maintenance
+ */
 class Orphans extends Maintenance {
        public function __construct() {
                parent::__construct();
                $this->mDescription = "Look for 'orphan' revisions hooked to pages which don't exist\n" .
-                                                               "And 'childless' pages with no revisions\n" .
+                                                               "and 'childless' pages with no revisions\n" .
                                                                "Then, kill the poor widows and orphans\n" .
                                                                "Man this is depressing";
                $this->addOption( 'fix', 'Actually fix broken entries' );
@@ -50,13 +57,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,18 +76,18 @@ 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 *
                        FROM $revision LEFT OUTER JOIN $page ON rev_page=page_id
                        WHERE page_id IS NULL
                " );
-               $orphans = $dbw->numRows( $result );
+               $orphans = $result->numRows();
                if ( $orphans > 0 ) {
                        global $wgContLang;
                        $this->output( "$orphans orphan revisions...\n" );
@@ -104,14 +112,14 @@ class Orphans extends Maintenance {
                } else {
                        $this->output( "No orphans! Yay!\n" );
                }
-       
+
                if ( $fix ) {
-                       $dbw->unlockTables();
+                       $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)
@@ -131,7 +139,7 @@ class Orphans extends Maintenance {
                        FROM $page LEFT OUTER JOIN $revision ON page_latest=rev_id
                        WHERE rev_id IS NULL
                " );
-               $widows = $dbw->numRows( $result );
+               $widows = $result->numRows();
                if ( $widows > 0 ) {
                        $this->output( "$widows childless pages...\n" );
                        $this->output( sprintf( "%10s %11s %2s %s\n", 'page_id', 'page_latest', 'ns', 'page_title' ) );
@@ -151,9 +159,9 @@ class Orphans extends Maintenance {
                } else {
                        $this->output( "No childless pages! Yay!\n" );
                }
-       
+
                if ( $fix ) {
-                       $dbw->unlockTables();
+                       $dbw->unlockTables( __METHOD__ );
                }
        }
 
@@ -163,14 +171,13 @@ class Orphans extends Maintenance {
         */
        private function checkSeparation( $fix ) {
                $dbw = wfGetDB( DB_MASTER );
-               $page     = $dbw->tableName( 'page' );
+               $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 *
@@ -202,12 +209,12 @@ class Orphans extends Maintenance {
                                                        'revision',
                                                        'rev_id',
                                                        array(
-                                                               'rev_page'      => $row->page_id,
+                                                               'rev_page' => $row->page_id,
                                                                'rev_timestamp' => $row2->max_timestamp ) );
                                                $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 +222,7 @@ class Orphans extends Maintenance {
                                $this->output( "wtf\n" );
                        }
                }
-       
+
                if ( $found ) {
                        $this->output( "Found $found pages with incorrect latest revision.\n" );
                } else {
@@ -224,12 +231,12 @@ class Orphans extends Maintenance {
                if ( !$fix && $found > 0 ) {
                        $this->output( "Run again with --fix to remove these entries automatically.\n" );
                }
-       
+
                if ( $fix ) {
-                       $dbw->unlockTables();
+                       $dbw->unlockTables( __METHOD__ );
                }
        }
 }
 
 $maintClass = "Orphans";
-require_once( DO_MAINTENANCE );
+require_once RUN_MAINTENANCE_IF_MAIN;