X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Forphans.php;h=78f98f5a38c3e8b903adfa5e0032147cabe5b173;hb=d834a4892af5ea57b3ee387dad79ad1a2205acad;hp=4a04a93489db67f1cb58461246f260ab23765e32;hpb=534611b355043343668825a9e4e9c22abdc92b9c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/orphans.php b/maintenance/orphans.php
index 4a04a93489..78f98f5a38 100644
--- 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,11 +76,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 +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)
@@ -151,9 +159,9 @@ class Orphans extends Maintenance {
 		} else {
 			$this->output( "No childless pages! Yay!\n" );
 		}
-	
+
 		if ( $fix ) {
-			$dbw->unlockTables();
+			$dbw->unlockTables( __METHOD__ );
 		}
 	}
 
@@ -165,12 +173,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 *
@@ -184,7 +191,6 @@ class Orphans extends Maintenance {
 				WHERE rev_page=$row->page_id
 			" );
 			$row2 = $dbw->fetchObject( $result2 );
-			$dbw->freeResult( $result2 );
 			if ( $row2 ) {
 				if ( $row->rev_timestamp != $row2->max_timestamp ) {
 					if ( $found == 0 ) {
@@ -208,7 +214,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 );
 					}
 				}
@@ -216,7 +222,7 @@ class Orphans extends Maintenance {
 				$this->output( "wtf\n" );
 			}
 		}
-	
+
 		if ( $found ) {
 			$this->output( "Found $found pages with incorrect latest revision.\n" );
 		} else {
@@ -225,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 );