Merge "resourceloader: Remove comment about XmlJsCode wrapper"

[lhc/web/wiklou.git] / includes / specials / SpecialFileDuplicateSearch.php

diff --git a/includes/specials/SpecialFileDuplicateSearch.php b/includes/specials/SpecialFileDuplicateSearch.php
index 3115adc..f047e1f 100644 (file)
--- a/includes/specials/SpecialFileDuplicateSearch.php
+++ b/includes/specials/SpecialFileDuplicateSearch.php
@@ -1,4 +1,5 @@
 <?php
+
 use MediaWiki\MediaWikiServices;
 
 /**
@@ -30,7 +31,7 @@ use MediaWiki\MediaWikiServices;
  *
  * @ingroup SpecialPage
  */
-class FileDuplicateSearchPage extends QueryPage {
+class SpecialFileDuplicateSearch extends QueryPage {
        protected $hash = '', $filename = '';
 
        /**
@@ -108,7 +109,7 @@ class FileDuplicateSearchPage extends QueryPage {
                $this->hash = '';
                $title = Title::newFromText( $this->filename, NS_FILE );
                if ( $title && $title->getText() != '' ) {
-                       $this->file = wfFindFile( $title );
+                       $this->file = MediaWikiServices::getInstance()->getRepoGroup()->findFile( $title );
                }
 
                $out = $this->getOutput();
@@ -209,10 +210,12 @@ class FileDuplicateSearchPage extends QueryPage {
        function formatResult( $skin, $result ) {
                $linkRenderer = $this->getLinkRenderer();
                $nt = $result->getTitle();
-               $text = MediaWikiServices::getInstance()->getContentLanguage()->convert( $nt->getText() );
+               $text = MediaWikiServices::getInstance()->getContentLanguage()->convert(
+                       htmlspecialchars( $nt->getText() )
+               );
                $plink = $linkRenderer->makeLink(
                        $nt,
-                       $text
+                       new HtmlArmor( $text )
                );
 
                $userText = $result->getUser( 'text' );