Merge "Improve page display title handling for category pages"

[lhc/web/wiklou.git] / includes / page / Article.php

diff --git a/includes/page/Article.php b/includes/page/Article.php
index 464bb60..7404f83 100644 (file)
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -878,10 +878,13 @@ class Article implements Page {
         * @param ParserOutput $pOutput
         */
        public function adjustDisplayTitle( ParserOutput $pOutput ) {
+               $out = $this->getContext()->getOutput();
+
                # Adjust the title if it was set by displaytitle, -{T|}- or language conversion
                $titleText = $pOutput->getTitleText();
                if ( strval( $titleText ) !== '' ) {
-                       $this->getContext()->getOutput()->setPageTitle( $titleText );
+                       $out->setPageTitle( $titleText );
+                       $out->setDisplayTitle( $titleText );
                }
        }