From acc2bcaf375c9a9f8d178a5daea2381cdfcad4cd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <niklas.laxstrom@gmail.com>
Date: Sat, 6 Dec 2014 11:31:32 +0100
Subject: [PATCH] Escape unescaped messages shown in action=info

Change-Id: Id16d8c8dff73fdacad6c9a4ff7f2919945b7e893
---
 includes/Linker.php             | 4 ++--
 includes/actions/InfoAction.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/Linker.php b/includes/Linker.php
index f220eba67d..3a039f60d5 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -2043,14 +2043,14 @@ class Linker {
 				if ( $titleObj->quickUserCan( 'edit' ) ) {
 					$editLink = self::link(
 						$titleObj,
-						wfMessage( 'editlink' )->text(),
+						wfMessage( 'editlink' )->escaped(),
 						array(),
 						array( 'action' => 'edit' )
 					);
 				} else {
 					$editLink = self::link(
 						$titleObj,
-						wfMessage( 'viewsourcelink' )->text(),
+						wfMessage( 'viewsourcelink' )->escaped(),
 						array(),
 						array( 'action' => 'edit' )
 					);
diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index beac822006..ff31eb67c4 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -297,7 +297,7 @@ class InfoAction extends FormlessAction {
 		// Content model of the page
 		$pageInfo['header-basic'][] = array(
 			$this->msg( 'pageinfo-content-model' ),
-			ContentHandler::getLocalizedName( $title->getContentModel() )
+			htmlspecialchars( ContentHandler::getLocalizedName( $title->getContentModel() ) )
 		);
 
 		// Search engine status
@@ -483,7 +483,7 @@ class InfoAction extends FormlessAction {
 				$this->msg( 'pageinfo-firsttime' ),
 				Linker::linkKnown(
 					$title,
-					$lang->userTimeAndDate( $firstRev->getTimestamp(), $user ),
+					htmlspecialchars( $lang->userTimeAndDate( $firstRev->getTimestamp(), $user ) ),
 					array(),
 					array( 'oldid' => $firstRev->getId() )
 				)
@@ -502,7 +502,7 @@ class InfoAction extends FormlessAction {
 				$this->msg( 'pageinfo-lasttime' ),
 				Linker::linkKnown(
 					$title,
-					$lang->userTimeAndDate( $this->page->getTimestamp(), $user ),
+					htmlspecialchars( $lang->userTimeAndDate( $this->page->getTimestamp(), $user ) ),
 					array(),
 					array( 'oldid' => $this->page->getLatest() )
 				)
-- 
2.20.1