From 36dc7a25a799df073234067fc15b326e18bd2915 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sun, 29 Mar 2009 11:04:20 +0000 Subject: [PATCH] Fixes for r48930: * Use user's language since it falls back to content if the message wasn't modified in user's language * Fix a typo in RELEASE-NOTES --- RELEASE-NOTES | 4 ++-- includes/Article.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 04843b4cec..427df0464c 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -152,8 +152,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * Add a class if 'missingsummary' is triggered to allow styling of the summary line * Add CSS defintion of the 'wikitable' class to shared.css -* (bug 17163) Added MediaWiki:Talkpage which will be displayed when viewing talk - pages +* (bug 17163) Added MediaWiki:Talkpageheader which will be displayed when + viewing talk pages * Add group convertsion support for LanguageConverter. New magic word "{{GROUPCONVERT:xxx}}" enabled for this new feature. You can set related conversion rules in [[MediaWiki:Groupconversiontable-xxx/language_code]]. diff --git a/includes/Article.php b/includes/Article.php index 1cc12f1489..cedc19db5b 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -867,8 +867,8 @@ class Article { # Allow a specific header on talk pages, like [[MediaWiki:Talkpagetext]] if( $this->mTitle->isTalkPage() ) { - if ( wfMsgForContent( 'talkpageheader' ) != '-' ) { - $wgOut->wrapWikiMsg( "
\n$1
", array( 'talkpageheader', 'options' => array( 'content' ) ) ); + if ( wfMsg( 'talkpageheader' ) != '-' ) { + $wgOut->wrapWikiMsg( "
\n$1
", array( 'talkpageheader' ) ); } } -- 2.20.1