Remove deprecated EditPage::spamPage()

Has been deprecated since 1.17, no callers anywhere in git that I
could find. One exception: AkismetKlik, which is being fixed in
I8c975f42.

Change-Id: Ie4cf4764e2223f277b8dd09d0ce629c2814e05be

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 47a6369..89b27ad 100644 (file)
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -63,6 +63,7 @@ production.
   categories.
 * action=query&meta=filerepoinfo now returns additional information for each
   repo.
+* EditPage::spamPage() was deprecated since 1.17 and has been removed.
 
 === Languages updated in 1.23===
 

diff --git a/includes/EditPage.php b/includes/EditPage.php
index be350cb..ab5856a 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3643,29 +3643,6 @@ HTML
                $wgOut->returnToMain( false, $this->mTitle );
        }
 
-       /**
-        * Produce the stock "your edit contains spam" page
-        *
-        * @param string|bool $match Text which triggered one or more filters
-        * @deprecated since 1.17 Use method spamPageWithContent() instead
-        */
-       static function spamPage( $match = false ) {
-               wfDeprecated( __METHOD__, '1.17' );
-
-               global $wgOut, $wgTitle;
-
-               $wgOut->prepareErrorPage( wfMessage( 'spamprotectiontitle' ) );
-
-               $wgOut->addHTML( '<div id="spamprotected">' );
-               $wgOut->addWikiMsg( 'spamprotectiontext' );
-               if ( $match ) {
-                       $wgOut->addWikiMsg( 'spamprotectionmatch', wfEscapeWikiText( $match ) );
-               }
-               $wgOut->addHTML( '</div>' );
-
-               $wgOut->returnToMain( false, $wgTitle );
-       }
-
        /**
         * Show "your edit contains spam" page with your diff and text
         *