From 31a794ead93d7d955b8e2b66d46d6ee15eea3caa Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Wed, 17 May 2006 13:44:43 +0000
Subject: [PATCH] * More escaping

---
 includes/SpecialContributions.php |  2 +-
 includes/SpecialWatchlist.php     | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index 5354ccad36..959af08783 100644
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -364,7 +364,7 @@ function ucListEdit( $sk, $row ) {
 	static $messages;
 	if( !isset( $messages ) ) {
 		foreach( explode( ' ', 'uctop diff newarticle rollbacklink diff hist minoreditletter' ) as $msg ) {
-			$messages[$msg] = wfMsg( $msg );
+			$messages[$msg] = wfMsgExt( $msg, array( 'escape') );
 		}
 	}
 
diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index a80c11f529..dc9602b811 100644
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -43,7 +43,7 @@ function wfSpecialWatchlist( $par ) {
 	/* float */ 'days' => floatval( $wgUser->getOption( 'watchlistdays' ) ), /* 3.0 or 0.5, watch further below */
 	/* bool  */ 'hideOwn' => (int)$wgUser->getBoolOption( 'watchlisthideown' ),
 	/* bool  */ 'hideBots' => (int)$wgUser->getBoolOption( 'watchlisthidebots' ),
-				'namespace' => 'all',
+	/* ?     */ 'namespace' => 'all',
 	);
 
 	extract($defaults);
@@ -343,12 +343,12 @@ function wfSpecialWatchlist( $par ) {
 	# Form for namespace filtering
 	$thisAction = $thisTitle->escapeLocalUrl();
 	$nsForm  = "<form method=\"post\" action=\"{$thisAction}\">\n";
-	$nsForm .= "<label for=\"namespace\">" . wfMsg( 'namespace' ) . "</label> ";
+	$nsForm .= "<label for=\"namespace\">" . wfMsgExt( 'namespace', array( 'parseinline') ) . "</label> ";
 	$nsForm .= HTMLnamespaceselector( $nameSpace, '' ) . "\n";
 	$nsForm .= ( $hideOwn ? "<input type=\"hidden\" name=\"hideown\" value=\"1\" />\n" : "" );
 	$nsForm .= ( $hideBots ? "<input type=\"hidden\" name=\"hidebots\" value=\"1\" />\n" : "" );
 	$nsForm .= "<input type=\"hidden\" name=\"days\" value=\"" . $days . "\" />\n";
-	$nsForm .= "<input type=\"submit\" name=\"submit\" value=\"" . wfMsgHtml( 'allpagessubmit' ) . "\" />\n";
+	$nsForm .= "<input type=\"submit\" name=\"submit\" value=\"" . wfMsgExt( 'allpagessubmit', array( 'escape') ) . "\" />\n";
 	$nsForm .= "</form>\n";
 	$wgOut->addHTML( $nsForm );
 
@@ -419,6 +419,9 @@ function wlDaysLink( $d, $page, $options = array() ) {
 	return $s;
 }
 
+/**
+ * Returns html
+ */
 function wlCutoffLinks( $days, $page = 'Watchlist', $options = array() ) {
 	$hours = array( 1, 2, 6, 12 );
 	$days = array( 1, 3, 7 );
@@ -431,7 +434,8 @@ function wlCutoffLinks( $days, $page = 'Watchlist', $options = array() ) {
 	foreach( $days as $d ) {
 		$days[$i++] = wlDaysLink( $d, $page, $options );
 	}
-	return wfMsg ('wlshowlast',
+	return wfMsgExt('wlshowlast',
+		array('parseinline', 'replaceafter'),
 		implode(' | ', $hours),
 		implode(' | ', $days),
 		wlDaysLink( 0, $page, $options ) );
-- 
2.20.1