From b30885e561f19153570c6ccf4a5fcc87d6cfeeff Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Sat, 16 Nov 2013 17:17:14 -0800 Subject: [PATCH] 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 --- RELEASE-NOTES-1.23 | 1 + includes/EditPage.php | 23 ----------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index 47a63690bb..89b27ad06f 100644 --- 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 be350cbd20..ab5856a1d0 100644 --- 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( '
' ); - $wgOut->addWikiMsg( 'spamprotectiontext' ); - if ( $match ) { - $wgOut->addWikiMsg( 'spamprotectionmatch', wfEscapeWikiText( $match ) ); - } - $wgOut->addHTML( '
' ); - - $wgOut->returnToMain( false, $wgTitle ); - } - /** * Show "your edit contains spam" page with your diff and text * -- 2.20.1