Merge "Warn if stateful ParserOutput transforms are used"

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

diff --git a/maintenance/orphans.php b/maintenance/orphans.php
index e36c5b6..a1cf166 100644 (file)
--- a/maintenance/orphans.php
+++ b/maintenance/orphans.php
@@ -75,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;
@@ -100,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,
@@ -197,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 ) {
@@ -247,5 +252,5 @@ class Orphans extends Maintenance {
        }
 }
 
-$maintClass = "Orphans";
+$maintClass = Orphans::class;
 require_once RUN_MAINTENANCE_IF_MAIN;