From c72a6b7779f2923cf1969d2989783770e38262aa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Wed, 17 Aug 2005 12:00:07 +0000 Subject: [PATCH] * (bug 3170) Page Title failed to obey MediaWiki:Pagetitle --- RELEASE-NOTES | 3 ++- includes/OutputPage.php | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index b4e03d40f5..14123e3d28 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -26,7 +26,8 @@ Misc work going on..... * Update all stats fields on recount.sql * Include software-visible client IP address in Special:Version comment as a proxy debugging aid - +* (bug 3170) Page Title failed to obey MediaWiki:Pagetitle. + wikititlesuffix was removed === Caveats === diff --git a/includes/OutputPage.php b/includes/OutputPage.php index b549c6d75f..aa46207a96 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -174,7 +174,8 @@ class OutputPage { $name .= ' - '.$taction; } } - $this->setHTMLTitle( $name . ' - ' . wfMsg( 'wikititlesuffix' ) ); + + $this->setHTMLTitle( wfMsg( 'pagetitle', $name ) ); } function getHTMLTitle() { return $this->mHTMLtitle; } function getPageTitle() { return $this->mPagetitle; } @@ -813,13 +814,13 @@ class OutputPage { $ret .= "\n"; - if ( "" == $this->mHTMLtitle ) { - $this->mHTMLtitle = wfMsg( "pagetitle", $this->mPagetitle ); + if ( '' == $this->getHTMLTitle() ) { + $this->setHTMLTitle( wfMsg( 'pagetitle', $this->getPageTitle() )); } $rtl = $wgContLang->isRTL() ? " dir='RTL'" : ''; $ret .= "\n"; - $ret .= "\n" . htmlspecialchars( $this->mHTMLtitle ) . "\n"; + $ret .= "\n" . htmlspecialchars( $this->getHTMLTitle() ) . "\n"; array_push( $this->mMetatags, array( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" ) ); $ret .= $this->getHeadLinks(); -- 2.20.1