Merge "Start working on phan-taint-check warnings. Fix minor escaping issues."

[lhc/web/wiklou.git] / includes / actions / HistoryAction.php

diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index ad26256..bd64a41 100644 (file)
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -197,8 +197,8 @@ class HistoryAction extends FormlessAction {
                $content .= Xml::dateMenu(
                        ( $year == null ? MWTimestamp::getLocalInstance()->format( 'Y' ) : $year ),
                        $month
-               ) . ' ';
-               $content .= $tagSelector ? ( implode( ' ', $tagSelector ) . ' ' ) : '';
+               ) . "\u{00A0}";
+               $content .= $tagSelector ? ( implode( "\u{00A0}", $tagSelector ) . "\u{00A0}" ) : '';
                $content .= $checkDeleted . Html::submitButton(
                        $this->msg( 'historyaction-submit' )->text(),
                        [],
@@ -836,7 +836,7 @@ class HistoryPager extends ReverseChronologicalPager {
                } else {
                        return MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
                                $this->getTitle(),
-                               $cur,
+                               new HtmlArmor( $cur ),
                                [],
                                [
                                        'diff' => $this->getWikiPage()->getLatest(),
@@ -868,7 +868,7 @@ class HistoryPager extends ReverseChronologicalPager {
                        # Next row probably exists but is unknown, use an oldid=prev link
                        return $linkRenderer->makeKnownLink(
                                $this->getTitle(),
-                               $last,
+                               new HtmlArmor( $last ),
                                [],
                                [
                                        'diff' => $prevRev->getId(),
@@ -887,7 +887,7 @@ class HistoryPager extends ReverseChronologicalPager {
 
                return $linkRenderer->makeKnownLink(
                        $this->getTitle(),
-                       $last,
+                       new HtmlArmor( $last ),
                        [],
                        [
                                'diff' => $prevRev->getId(),