From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Fri, 10 Feb 2012 21:13:42 +0000 (+0000)
Subject: part 1 of fix for Bug 30332 - API spamblocklist error should provide *all* blocked... 
X-Git-Tag: 1.31.0-rc.0~24785
X-Git-Url: https://git.cyclocoop.org/%20%27.%28%24debut%20%20%20%24par_page%29.%27?a=commitdiff_plain;h=3ba3f15e8d35e771a5419412f0b41a7fb947a870;p=lhc%2Fweb%2Fwiklou.git

part 1 of fix for Bug 30332 - API spamblocklist error should provide *all* blocked URLs, not just one
Patch from Jarry1250
---

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