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 "Make MessageCache use the immutable text cache during cache rebuilds"
[lhc/web/wiklou.git]
/
includes
/
widget
/
search
/
SearchFormWidget.php
diff --git
a/includes/widget/search/SearchFormWidget.php
b/includes/widget/search/SearchFormWidget.php
index
e223b95
..
a7407a0
100644
(file)
--- a/
includes/widget/search/SearchFormWidget.php
+++ b/
includes/widget/search/SearchFormWidget.php
@@
-79,6
+79,8
@@
class SearchFormWidget {
* @return string HTML
*/
protected function shortDialogHtml( $profile, $term, $numResults, $totalResults, $offset ) {
* @return string HTML
*/
protected function shortDialogHtml( $profile, $term, $numResults, $totalResults, $offset ) {
+ $html = '';
+
$searchWidget = new SearchInputWidget( [
'id' => 'searchText',
'name' => 'search',
$searchWidget = new SearchInputWidget( [
'id' => 'searchText',
'name' => 'search',
@@
-96,11
+98,7
@@
class SearchFormWidget {
'align' => 'top',
] );
'align' => 'top',
] );
- $html =
- Html::hidden( 'title', $this->specialSearch->getPageTitle()->getPrefixedText() ) .
- Html::hidden( 'profile', $profile ) .
- Html::hidden( 'fulltext', '1' ) .
- $layout;
+ $html .= $layout;
if ( $totalResults > 0 && $offset < $totalResults ) {
$html .= Xml::tags(
if ( $totalResults > 0 && $offset < $totalResults ) {
$html .= Xml::tags(
@@
-113,6
+111,11
@@
class SearchFormWidget {
);
}
);
}
+ $html .=
+ Html::hidden( 'title', $this->specialSearch->getPageTitle()->getPrefixedText() ) .
+ Html::hidden( 'profile', $profile ) .
+ Html::hidden( 'fulltext', '1' );
+
return $html;
}
return $html;
}
@@
-203,16
+206,13
@@
class SearchFormWidget {
*/
protected function optionsHtml( $term, $isPowerSearch, $profile ) {
$html = '';
*/
protected function optionsHtml( $term, $isPowerSearch, $profile ) {
$html = '';
- $opts = [
- 'profile' => $profile,
- ];
if ( $isPowerSearch ) {
if ( $isPowerSearch ) {
- $html .= $this->powerSearchBox( $term,
$opts
);
+ $html .= $this->powerSearchBox( $term,
[]
);
} else {
$form = '';
Hooks::run( 'SpecialSearchProfileForm', [
} else {
$form = '';
Hooks::run( 'SpecialSearchProfileForm', [
- $this->specialSearch, &$form, $profile, $term,
$opts
+ $this->specialSearch, &$form, $profile, $term,
[]
] );
$html .= $form;
}
] );
$html .= $form;
}
@@
-297,7
+297,7
@@
class SearchFormWidget {
return
"<fieldset id='mw-searchoptions'>" .
"<legend>" . $this->specialSearch->msg( 'powersearch-legend' )->escaped() . '</legend>' .
return
"<fieldset id='mw-searchoptions'>" .
"<legend>" . $this->specialSearch->msg( 'powersearch-legend' )->escaped() . '</legend>' .
- "<h4>" . $this->specialSearch->msg( 'powersearch-ns' )->
escaped
() . '</h4>' .
+ "<h4>" . $this->specialSearch->msg( 'powersearch-ns' )->
parse
() . '</h4>' .
// populated by js if available
"<div id='mw-search-togglebox'></div>" .
$divider .
// populated by js if available
"<div id='mw-search-togglebox'></div>" .
$divider .