Merge "Sync HISTORY with RELEASE-NOTES from REL1_18"

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 8f4761c..31e6626 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3027,12 +3027,15 @@ 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 string|Array|bool Text (or array of texts) which triggered one or more filters
         */
        public function spamPageWithContent( $match = false ) {
-               global $wgOut;
+               global $wgOut, $wgLang;
                $this->textbox2 = $this->textbox1;
 
+               if( is_array( $match ) ){
+                       $match = $wgLang->listToText( $match );
+               }
                $wgOut->prepareErrorPage( wfMessage( 'spamprotectiontitle' ) );
 
                $wgOut->addHTML( '<div id="spamprotected">' );