part 1 of fix for Bug 30332 - API spamblocklist error should provide *all* blocked...
authorMark A. Hershberger <mah@users.mediawiki.org>
Fri, 10 Feb 2012 21:13:42 +0000 (21:13 +0000)
committerMark A. Hershberger <mah@users.mediawiki.org>
Fri, 10 Feb 2012 21:13:42 +0000 (21:13 +0000)
Patch from Jarry1250

includes/EditPage.php

index 9c7a7c9..c5443c2 100644 (file)
@@ -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">' );