* (bug 12380) Bot-friendly EditPage::spamPage

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 76654da..cd5e33f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -261,7 +261,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12346) XML fix when body double-click and click handlers are present
 * Fix regression -- missing feed links in sidebar on Special:Recentchanges
 * (bug 12371) Handle more namespace case variants in namespaceDupes.php
-
+* (bug 12380) Bot-friendly EditPage::spamPage
 
 == Parser changes in 1.12 ==
 

diff --git a/includes/EditPage.php b/includes/EditPage.php
index ba0482e..a390598 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1592,9 +1592,11 @@ END
                $wgOut->setRobotPolicy( 'noindex,nofollow' );
                $wgOut->setArticleRelated( false );
 
+               $wgOut->addHtml( '<div id="spamprotected">' );
                $wgOut->addWikiText( wfMsg( 'spamprotectiontext' ) );
                if ( $match )
-                       $wgOut->addWikiText( wfMsg( 'spamprotectionmatch', "<nowiki>{$match}</nowiki>" ) );
+                       $wgOut->addWikiText( wfMsg( 'spamprotectionmatch',wfEscapeWikiText( $match ) ) );
+               $wgOut->addHtml( '</div>' );
 
                $wgOut->returnToMain( false, $wgTitle );
        }