From: Chad Horohoe <chadh@wikimedia.org>
Date: Tue, 17 Jun 2014 16:51:03 +0000 (-0700)
Subject: Actually format search error Status objects nicely
X-Git-Tag: 1.31.0-rc.0~15357^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/modifier.php?a=commitdiff_plain;h=dcc1b377f4117855e8846431dbe53f442052fc9f;p=lhc%2Fweb%2Fwiklou.git

Actually format search error Status objects nicely

htmlspecialchars() on wikitext that's passed to addHtml()?

Change-Id: I6cff09ebc052841b923bbed8b9fa02a208e7d61c
---

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 965885eadc..1cc5930ac7 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -412,7 +412,7 @@ class SpecialSearch extends SpecialPage {
 		if ( $num === 0 ) {
 			if ( $textStatus ) {
 				$out->addHTML( '<div class="error">' .
-					htmlspecialchars( $textStatus->getWikiText( 'search-error' ) ) . '</div>' );
+					$textStatus->getMessage( 'search-error' ) . '</div>' );
 			} else {
 				$out->wrapWikiMsg( "<p class=\"mw-search-nonefound\">\n$1</p>",
 					array( 'search-nonefound', wfEscapeWikiText( $term ) ) );