X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=maintenance%2Forphans.php;h=54a68aeb36216ba69f62e68ff0b434fca1c09b38;hb=bc6ed2ba24a8691ad6d6cc321a43720bcfb770e2;hp=2da883064398c8db14c2fec7e2eafc5a09fdc7cb;hpb=f9e21f91e459c40fed6d8f2e76cccbce07e2ba1b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/orphans.php b/maintenance/orphans.php
index 2da8830643..54a68aeb36 100644
--- a/maintenance/orphans.php
+++ b/maintenance/orphans.php
@@ -30,6 +30,8 @@
 
 require_once __DIR__ . '/Maintenance.php';
 
+use Wikimedia\Rdbms\IMaintainableDatabase;
+
 /**
  * Maintenance script that looks for 'orphan' revisions hooked to pages which
  * don't exist and 'childless' pages with no revisions.
@@ -56,7 +58,7 @@ class Orphans extends Maintenance {
 
 	/**
 	 * Lock the appropriate tables for the script
-	 * @param Database $db
+	 * @param IMaintainableDatabase $db
 	 * @param string[] $extraTable The name of any extra tables to lock (eg: text)
 	 */
 	private function lockTables( $db, $extraTable = [] ) {
@@ -73,20 +75,24 @@ class Orphans extends Maintenance {
 	 */
 	private function checkOrphans( $fix ) {
 		$dbw = $this->getDB( DB_MASTER );
-		$page = $dbw->tableName( 'page' );
-		$revision = $dbw->tableName( 'revision' );
+		$commentStore = new CommentStore( 'rev_comment' );
 
 		if ( $fix ) {
 			$this->lockTables( $dbw );
 		}
 
+		$commentQuery = $commentStore->getJoin();
+
 		$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
-		" );
+		$result = $dbw->select(
+			[ 'revision', 'page' ] + $commentQuery['tables'],
+			[ 'rev_id', 'rev_page', 'rev_timestamp', 'rev_user_text' ] + $commentQuery['fields'],
+			[ 'page_id' => null ],
+			__METHOD__,
+			[],
+			[ 'page' => [ 'LEFT JOIN', [ 'rev_page=page_id' ] ] ] + $commentQuery['joins']
+		);
 		$orphans = $result->numRows();
 		if ( $orphans > 0 ) {
 			global $wgContLang;
@@ -98,9 +104,10 @@ class Orphans extends Maintenance {
 			) );
 
 			foreach ( $result as $row ) {
-				$comment = ( $row->rev_comment == '' )
-					? ''
-					: '(' . $wgContLang->truncate( $row->rev_comment, 40 ) . ')';
+				$comment = $commentStore->getComment( $row )->text;
+				if ( $comment !== '' ) {
+					$comment = '(' . $wgContLang->truncate( $comment, 40 ) . ')';
+				}
 				$this->output( sprintf( "%10d %10d %14s %20s %s\n",
 					$row->rev_id,
 					$row->rev_page,
@@ -195,8 +202,8 @@ class Orphans extends Maintenance {
 			$result2 = $dbw->query( "
 				SELECT MAX(rev_timestamp) as max_timestamp
 				FROM $revision
-				WHERE rev_page=$row->page_id
-			" );
+				WHERE rev_page=" . (int)( $row->page_id )
+			);
 			$row2 = $dbw->fetchObject( $result2 );
 			if ( $row2 ) {
 				if ( $row->rev_timestamp != $row2->max_timestamp ) {