Merge "Introduce ContentHandler::getSecondaryDataUpdates."

[lhc/web/wiklou.git] / includes / content / ContentHandler.php

diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php
index b50fe23..fab043a 100644 (file)
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -1390,14 +1390,20 @@ abstract class ContentHandler {
         * @return ParserOutput
         */
        public function getParserOutputForIndexing( WikiPage $page, ParserCache $cache = null ) {
+               // TODO: MCR: ContentHandler should be called per slot, not for the whole page.
+               // See T190066.
                $parserOptions = $page->makeParserOptions( 'canonical' );
-               $revId = $page->getRevision()->getId();
                if ( $cache ) {
                        $parserOutput = $cache->get( $page, $parserOptions );
                }
+
                if ( empty( $parserOutput ) ) {
+                       $renderer = MediaWikiServices::getInstance()->getRevisionRenderer();
                        $parserOutput =
-                               $page->getContent()->getParserOutput( $page->getTitle(), $revId, $parserOptions );
+                               $renderer->getRenderedRevision(
+                                       $page->getRevision()->getRevisionRecord(),
+                                       $parserOptions
+                               )->getRevisionParserOutput();
                        if ( $cache ) {
                                $cache->save( $parserOutput, $page, $parserOptions );
                        }