Merge "Prefer using plaintextParams instead of rawParams where possible"

diff --combined includes/specials/SpecialUndelete.php
index 62a48c6,9cb3407..71dee3d
--- 1/includes/specials/SpecialUndelete.php
--- 2/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@@ -969,12 -969,12 +969,12 @@@ class SpecialUndelete extends SpecialPa
                        $key = urlencode( $row->fa_storage_key );
                        $pageLink = $this->getFileLink( $file, $this->getPageTitle(), $ts, $key );
                } else {
 -                      $pageLink = $this->getLanguage()->userTimeAndDate( $ts, $user );
 +                      $pageLink = htmlspecialchars( $this->getLanguage()->userTimeAndDate( $ts, $user ) );
                }
                $userLink = $this->getFileUser( $file );
                $data = $this->msg( 'widthheight' )->numParams( $row->fa_width, $row->fa_height )->text();
                $bytes = $this->msg( 'parentheses' )
-                       ->rawParams( $this->msg( 'nbytes' )->numParams( $row->fa_size )->text() )
+                       ->plaintextParams( $this->msg( 'nbytes' )->numParams( $row->fa_size )->text() )
                        ->plain();
                $data = htmlspecialchars( $data . ' ' . $bytes );
                $comment = $this->getFileComment( $file );
@@@ -1049,7 -1049,7 +1049,7 @@@
                $time = $this->getLanguage()->userTimeAndDate( $ts, $user );
  
                if ( !$file->userCan( File::DELETED_FILE, $user ) ) {
 -                      return '<span class="history-deleted">' . $time . '</span>';
 +                      return '<span class="history-deleted">' . htmlspecialchars( $time ) . '</span>';
                }
  
                $link = $this->getLinkRenderer()->makeKnownLink(