dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Align "What's this" vertically"
[lhc/web/wiklou.git]
/
includes
/
widget
/
search
/
DidYouMeanWidget.php
diff --git
a/includes/widget/search/DidYouMeanWidget.php
b/includes/widget/search/DidYouMeanWidget.php
index
3aee87b
..
4e5b76b
100644
(file)
--- a/
includes/widget/search/DidYouMeanWidget.php
+++ b/
includes/widget/search/DidYouMeanWidget.php
@@
-2,7
+2,7
@@
namespace MediaWiki\Widget\Search;
namespace MediaWiki\Widget\Search;
-use
Linke
r;
+use
HtmlArmo
r;
use SearchResultSet;
use SpecialSearch;
use SearchResultSet;
use SpecialSearch;
@@
-53,18
+53,20
@@
class DidYouMeanWidget {
];
$stParams = array_merge( $params, $this->specialSearch->powerSearchOptions() );
];
$stParams = array_merge( $params, $this->specialSearch->powerSearchOptions() );
- $rewritten = Linker::linkKnown(
+ $linkRenderer = $this->specialSearch->getLinkRenderer();
+ $snippet = $resultSet->getQueryAfterRewriteSnippet();
+ $rewritten = $linkRenderer->makeKnownLink(
$this->specialSearch->getPageTitle(),
$this->specialSearch->getPageTitle(),
- $
resultSet->getQueryAfterRewriteSnippet() ?
: null,
+ $
snippet ? new HtmlArmor( $snippet )
: null,
[ 'id' => 'mw-search-DYM-rewritten' ],
$stParams
);
$stParams['search'] = $term;
$stParams['runsuggestion'] = 0;
[ 'id' => 'mw-search-DYM-rewritten' ],
$stParams
);
$stParams['search'] = $term;
$stParams['runsuggestion'] = 0;
- $original =
Linker::linkKnown
(
+ $original =
$linkRenderer->makeKnownLink
(
$this->specialSearch->getPageTitle(),
$this->specialSearch->getPageTitle(),
-
htmlspecialchars( $term, ENT_QUOTES, 'UTF-8' )
,
+
$term
,
[ 'id' => 'mwsearch-DYM-original' ],
$stParams
);
[ 'id' => 'mwsearch-DYM-original' ],
$stParams
);
@@
-89,9
+91,10
@@
class DidYouMeanWidget {
];
$stParams = array_merge( $params, $this->specialSearch->powerSearchOptions() );
];
$stParams = array_merge( $params, $this->specialSearch->powerSearchOptions() );
- $suggest = Linker::linkKnown(
+ $snippet = $resultSet->getSuggestionSnippet();
+ $suggest = $this->specialSearch->getLinkRenderer()->makeKnownLink(
$this->specialSearch->getPageTitle(),
$this->specialSearch->getPageTitle(),
- $
resultSet->getSuggestionSnippet() ?
: null,
+ $
snippet ? new HtmlArmor( $snippet )
: null,
[ 'id' => 'mw-search-DYM-suggestion' ],
$stParams
);
[ 'id' => 'mw-search-DYM-suggestion' ],
$stParams
);