dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 59db0ac)
* (bug 3170) Page Title failed to obey MediaWiki:Pagetitle
authorNiklas Laxström <nikerabbit@users.mediawiki.org>
Wed, 17 Aug 2005 12:00:07 +0000 (12:00 +0000)
committerNiklas Laxström <nikerabbit@users.mediawiki.org>
Wed, 17 Aug 2005 12:00:07 +0000 (12:00 +0000)
RELEASE-NOTES patch | blob | history
includes/OutputPage.php patch | blob | history

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b4e03d4..14123e3 100644 (file)
--- 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 b549c6d..aa46207 100644 (file)
--- 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 .= "<!DOCTYPE html PUBLIC \"$wgDocType\"\n        \"$wgDTD\">\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 .= "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"$wgContLanguageCode\" lang=\"$wgContLanguageCode\" $rtl>\n";
-               $ret .= "<head>\n<title>" . htmlspecialchars( $this->mHTMLtitle ) . "</title>\n";
+               $ret .= "<head>\n<title>" . htmlspecialchars( $this->getHTMLTitle() ) . "</title>\n";
                array_push( $this->mMetatags, array( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" ) );
 
                $ret .= $this->getHeadLinks();
Wiklou, le Wiki du Wiklou