Backported r53159 to 1.14 and 1.15

Tim Starling · Tim Starling · commit 6a30017acfec · 2009-07-13T17:13:27.000Z
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
@@ -26,6 +26,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   ForeignAPIRepo.
 * Fixed the "change password" link on Special:Preferences to have the correct
   returnto parameter.
+* (bug 19693) Fixed cross-site scripting vulnerability in Special:Block
 
 === Changes since 1.15.0rc1 ===
 
diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
@@ -632,7 +632,7 @@ private function getConvenienceLinks() {
 	 */
 	private function getContribsLink( $skin ) {
 		$contribsPage = SpecialPage::getTitleFor( 'Contributions', $this->BlockAddress );
-		return $skin->link( $contribsPage, wfMsgHtml( 'ipb-blocklist-contribs', $this->BlockAddress ) );
+		return $skin->link( $contribsPage, wfMsgExt( 'ipb-blocklist-contribs', 'escape', $this->BlockAddress ) );
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,7 @@ private function getConvenienceLinks() {`
`632`	`632`	`*/`
`633`	`633`	`private function getContribsLink( $skin ) {`
`634`	`634`	`$contribsPage = SpecialPage::getTitleFor( 'Contributions', $this->BlockAddress );`
`635`		`- return $skin->link( $contribsPage, wfMsgHtml( 'ipb-blocklist-contribs', $this->BlockAddress ) );`
	`635`	`+ return $skin->link( $contribsPage, wfMsgExt( 'ipb-blocklist-contribs', 'escape', $this->BlockAddress ) );`
`636`	`636`	`}`
`637`	`637`
`638`	`638`	`/**`