Update to MediaWiki 1.21.1

1 files changed, 21 insertions, 6 deletions

diff --git a/maintenance/rebuildtextindex.php b/maintenance/rebuildtextindex.php
index 41b245f8..534b7ca1 100644
--- a/maintenance/rebuildtextindex.php
+++ b/maintenance/rebuildtextindex.php
@@ -92,22 +92,37 @@ class RebuildTextIndex extends Maintenance {
 		$this->output( "Rebuilding index fields for {$count} pages...\n" );
 		$n = 0;
 
+		$fields = array_merge(
+			Revision::selectPageFields(),
+			Revision::selectFields(),
+			Revision::selectTextFields()
+		);
+
 		while ( $n < $count ) {
 			if ( $n ) {
 				$this->output( $n . "\n" );
 			}
 			$end = $n + self::RTI_CHUNK_SIZE - 1;
 
-			$res = $this->db->select( array( 'page', 'revision', 'text' ),
-				array( 'page_id', 'page_namespace', 'page_title', 'old_flags', 'old_text' ),
+			$res = $this->db->select( array( 'page', 'revision', 'text' ), $fields,
 				array( "page_id BETWEEN $n AND $end", 'page_latest = rev_id', 'rev_text_id = old_id' ),
 				__METHOD__
-				);
+			);
 
 			foreach ( $res as $s ) {
-				$revtext = Revision::getRevisionText( $s );
-				$u = new SearchUpdate( $s->page_id, $s->page_title, $revtext );
-				$u->doUpdate();
+				try {
+					$title = Title::makeTitle( $s->page_namespace, $s->page_title );
+
+					$rev = new Revision( $s );
+					$content = $rev->getContent();
+					$text = $content->getTextForSearchIndex();
+
+					$u = new SearchUpdate( $s->page_id, $title, $text );
+					$u->doUpdate();
+				} catch ( MWContentSerializationException $ex ) {
+					$this->output( "Failed to deserialize content of revision {$s->rev_id} of page "
+						. "`" . $title->getPrefixedDBkey() . "`!\n" );
+				}
 			}
 			$n += self::RTI_CHUNK_SIZE;
 		}