From 42ef3a283d84578f2517845e790edead60c5d31d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Thu, 2 Jul 2009 12:32:28 +0000
Subject: [PATCH] Check for wfEmptyMsg too, since message cache checks messages
 set to - in files, trying to get from namespace, and returns non-existing
 message instead

---
 includes/EditPage.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/EditPage.php b/includes/EditPage.php
index dd934d8e1c..8fbbdb187a 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -657,6 +657,7 @@ class EditPage {
 			}
 		}
 
+		// FIXME: unused variable?
 		$this->oldid = $request->getInt( 'oldid' );
 
 		$this->live = $request->getCheck( 'live' );
@@ -1708,7 +1709,7 @@ END
 		// so should remain short!
 		wfRunHooks( 'EditPageTosSummary', array( $this->mTitle, &$msg ) );
 		$text = wfMsg( $msg );
-		if( $text != '-' ) {
+		if( !wfEmptyMsg( $msg, $text ) && $text !== '-' ) {
 			global $wgOut;
 			$wgOut->addHTML( '<div class="mw-tos-summary">' );
 			$wgOut->addWikiMsgArray( $msg, array() );
-- 
2.20.1