From: Chad Horohoe <demon@users.mediawiki.org>
Date: Mon, 25 Aug 2008 13:39:33 +0000 (+0000)
Subject: Use wfEmptyMsg() here instead of !$tagDescription. Should make <non-existent-message... 
X-Git-Tag: 1.31.0-rc.0~45680
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=fff8ae9026fc2f13d3b7ebc014a623ab81de73f9;p=lhc%2Fweb%2Fwiklou.git

Use wfEmptyMsg() here instead of !$tagDescription. Should make <non-existent-message> errors when a particular HTML tag doesn't exist (notably, diff-s) to go away now. Should now output the raw tag ('<s>', again in the noticed case). Oddly, I like that more than the messages ;-)
---

diff --git a/includes/HTMLDiff.php b/includes/HTMLDiff.php
index 14a19ef70f..aa02b7aab2 100644
--- a/includes/HTMLDiff.php
+++ b/includes/HTMLDiff.php
@@ -1157,8 +1157,8 @@ class TagToString {
 
 	public function getRemovedDescription(ChangeText $txt) {
 		$tagDescription = wfMsgExt('diff-' . $this->node->qName, 'parseinline' );
-		if(!$tagDescription){
-			$tagDescription = $this->node->qName;
+		if( wfEmptyMsg( 'diff-' . $this->node->qName, $tagDescription ) ){
+			$tagDescription = "&lt;" . $this->node->qName . "&gt;";
 		}
 		if ($this->sem == TagToStringFactory::MOVED) {
 			$txt->addHtml( wfMsgExt( 'diff-movedoutof', 'parseinline', $tagDescription ) );
@@ -1173,8 +1173,8 @@ class TagToString {
 
 	public function getAddedDescription(ChangeText $txt) {
 		$tagDescription = wfMsgExt('diff-' . $this->node->qName, 'parseinline' );
-		if(!$tagDescription){
-			$tagDescription = $this->node->qName;
+		if( wfEmptyMsg( 'diff-' . $this->node->qName, $tagDescription ) ){
+			$tagDescription = "&lt;" . $this->node->qName . "&gt;";
 		}
 		if ($this->sem == TagToStringFactory::MOVED) {
 			$txt->addHtml( wfMsgExt( 'diff-movedto' , 'parseinline', $tagDescription) );
@@ -1218,7 +1218,7 @@ class TagToString {
 	protected function translateArgument($name) {
 		$translation = wfMsgExt('diff-' . $name, 'parseinline' );
 		if ( wfEmptyMsg( 'diff-' . $name, $translation ) ) {
-			$translation = $name;
+			$translation = "&lt;" . $name . "&gt;";;
 		}
 		return htmlspecialchars( $translation );
 	}
@@ -1232,8 +1232,8 @@ class NoContentTagToString extends TagToString {
 
 	public function getAddedDescription(ChangeText $txt) {
 		$tagDescription = wfMsgExt('diff-' . $this->node->qName, 'parseinline' );
-		if(!$tagDescription){
-			$tagDescription = $this->node->qName;
+		if( wfEmptyMsg( 'diff-' . $this->node->qName, $tagDescription ) ){
+			$tagDescription = "&lt;" . $this->node->qName . "&gt;";
 		}
 		$txt->addHtml( wfMsgExt('diff-changedto', 'parseinline' ) . ' ' . $tagDescription);
 		$this->addAttributes($txt, $this->node->attributes);