From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Mon, 30 Mar 2009 09:47:22 +0000 (+0000)
Subject: Fix regression from r48990
X-Git-Tag: 1.31.0-rc.0~42272
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=66601f9174081297a7805f3f1dd641ed78fcc632;p=lhc%2Fweb%2Fwiklou.git

Fix regression from r48990
---

diff --git a/includes/Article.php b/includes/Article.php
index cedc19db5b..e56a384771 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -867,7 +867,8 @@ class Article {
 
 		# Allow a specific header on talk pages, like [[MediaWiki:Talkpagetext]]
 		if( $this->mTitle->isTalkPage() ) {
-			if ( wfMsg( 'talkpageheader' ) != '-' ) {
+			$msg = wfMsgNoTrans( 'talkpageheader' );
+			if ( $msg !== '-' && !wfEmptyMsg( 'talkpageheader', $msg ) ) {
 				$wgOut->wrapWikiMsg( "<div class=\"mw-talkpageheader\">\n$1</div>", array( 'talkpageheader' ) );
 			}
 		}