From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Mon, 13 Feb 2012 12:40:21 +0000 (+0000)
Subject: revert r111225 and r111201
X-Git-Tag: 1.31.0-rc.0~24740
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=0f897b070be77bde8aae48c03d53a8d150ca884c;p=lhc%2Fweb%2Fwiklou.git

revert r111225 and r111201
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 4669ad8667..d40925214d 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3037,16 +3037,12 @@ HTML
 	/**
 	 * Show "your edit contains spam" page with your diff and text
 	 *
-	 * @param $match array|string|bool Text (or array of texts) which triggered one or more filters
+	 * @param $match string|bool Text which triggered one or more filters
 	 */
 	public function spamPageWithContent( $match = false ) {
-		global $wgOut, $wgLang;
+		global $wgOut;
 		$this->textbox2 = $this->textbox1;
 
-		if( is_array( $match ) ){
-			$match = $wgLang->listToText( $match );
-		}
-
 		$wgOut->prepareErrorPage( wfMessage( 'spamprotectiontitle' ) );
 
 		$wgOut->addHTML( '<div id="spamprotected">' );