Fix for issue noted on CR r64876: fatal error on CSS/JS subpage display

[lhc/web/wiklou.git] / includes / OutputPage.php

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 33753c0..802740e 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -9,7 +9,7 @@ class OutputPage {
        var $mMetatags = array(), $mKeywords = array(), $mLinktags = array();
        var $mExtStyles = array();
        var $mPagetitle = '', $mBodytext = '', $mDebugtext = '';
-       var $mHTMLtitle = '', $mHTMLtitleFromPagetitle = true, $mIsarticle = true, $mPrintable = false;
+       var $mHTMLtitle = '', $mIsarticle = true, $mPrintable = false;
        var $mSubtitle = '', $mRedirect = '', $mStatusCode;
        var $mLastModified = '', $mETag = false;
        var $mCategoryLinks = array(), $mCategories = array(), $mLanguageLinks = array();
@@ -447,17 +447,9 @@ class OutputPage {
        /**
         * "HTML title" means the contents of <title>.
         * It is stored as plain, unescaped text and will be run through htmlspecialchars in the skin file.
-        * If $name is from page title, it can only override names which are also from page title,
-        * but if it is not from page title, it can override all other names.
         */
-       public function setHTMLTitle( $name, $frompagetitle = false ) {
-               if ( $frompagetitle && $this->mHTMLtitleFromPagetitle ) {
-                       $this->mHTMLtitle = $name;
-               }
-               elseif ( $this->mHTMLtitleFromPagetitle ) {
-                       $this->mHTMLtitle = $name;
-                       $this->mHTMLtitleFromPagetitle = false;
-               }
+       public function setHTMLTitle( $name ) {
+               $this->mHTMLtitle = $name;
        }
 
        /**
@@ -487,7 +479,7 @@ class OutputPage {
                }
 
                # change "<i>foo&amp;bar</i>" to "foo&bar"
-               $this->setHTMLTitle( wfMsg( 'pagetitle', Sanitizer::stripAllTags( $nameWithTags ) ), true );
+               $this->setHTMLTitle( wfMsg( 'pagetitle', Sanitizer::stripAllTags( $nameWithTags ) ) );
        }
 
        /**
@@ -1104,11 +1096,6 @@ class OutputPage {
                                $this->mTemplateIds[$ns] = $dbks;
                        }
                }
-               // Page title
-               $title = $parserOutput->getTitleText();
-               if ( $title != '' ) {
-                       $this->setPageTitle( $title );
-               }
 
                // Hooks registered in the object
                global $wgParserOutputHooks;