From: Victor Vasiliev <vasilievvv@users.mediawiki.org>
Date: Sat, 22 Dec 2007 15:13:25 +0000 (+0000)
Subject: * (bug 12380) Bot-friendly EditPage::spamPage
X-Git-Tag: 1.31.0-rc.0~50305
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=cdb30ef5844769e74ac3df9c747c6d06d47eb8a5;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 76654daaff..cd5e33fb99 100644
--- 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 ba0482e945..a3905982e0 100644
--- 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 );
 	}