X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialFileDuplicateSearch.php;h=7694a61069c4ea9fefe58f8ab6ce200e81a77202;hb=27c61fb1e94da9114314468fd00bcf129ec064b6;hp=bb82d03da9df75f10a2179032e921aa931dd714e;hpb=0af7afc9d3f7e82078c5d372473689e2ed7e7d27;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/specials/SpecialFileDuplicateSearch.php b/includes/specials/SpecialFileDuplicateSearch.php index bb82d03da9..7694a61069 100644 --- a/includes/specials/SpecialFileDuplicateSearch.php +++ b/includes/specials/SpecialFileDuplicateSearch.php @@ -1,4 +1,6 @@ [ 'image' ], + 'tables' => $imgQuery['tables'], 'fields' => [ 'title' => 'img_name', 'value' => 'img_sha1', - 'img_user_text', + 'img_user_text' => $imgQuery['fields']['img_user_text'], 'img_timestamp' ], - 'conds' => [ 'img_sha1' => $this->hash ] + 'conds' => [ 'img_sha1' => $this->hash ], + 'join_conds' => $imgQuery['joins'], ]; } @@ -206,11 +210,12 @@ class FileDuplicateSearchPage extends QueryPage { function formatResult( $skin, $result ) { global $wgContLang; + $linkRenderer = $this->getLinkRenderer(); $nt = $result->getTitle(); $text = $wgContLang->convert( $nt->getText() ); - $plink = Linker::link( + $plink = $linkRenderer->makeLink( $nt, - htmlspecialchars( $text ) + $text ); $userText = $result->getUser( 'text' ); @@ -244,7 +249,7 @@ class FileDuplicateSearchPage extends QueryPage { // No prefix suggestion outside of file namespace return []; } - $searchEngine = SearchEngine::create(); + $searchEngine = MediaWikiServices::getInstance()->newSearchEngine(); $searchEngine->setLimitOffset( $limit, $offset ); // Autocomplete subpage the same as a normal search, but just for files $searchEngine->setNamespaces( [ NS_FILE ] );