jenkins-bot has submitted this change and it was merged.
Change subject: Fix search bar not being shown
......................................................................
Fix search bar not being shown
Lucene might be $wgSearchType, not just in $wgSearchTypeAlternatives
Bug: 60691
Change-Id: I921badd9616aba21ee04cfdd82ab99de2e85ba70
(cherry picked from commit d7422fd18e3e55206ebdfa5d130c68809d1972b7)
---
M pages/TalkpageView.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pages/TalkpageView.php b/pages/TalkpageView.php
index acc80da..b3f0048 100644
--- a/pages/TalkpageView.php
+++ b/pages/TalkpageView.php
@@ -308,7 +308,7 @@
}
global $wgSearchTypeAlternatives;
- if ( in_array( "LuceneSearch", $wgSearchTypeAlternatives ?:
array() ) ) {
+ if ( $wgSearchType == "LuceneSearch" || in_array(
"LuceneSearch", $wgSearchTypeAlternatives ?: array() ) ) {
$talkpageHeader .= $this->getSearchBox();
}
$talkpageHeader .= $this->showTalkpageViewOptions( $article );
--
To view, visit https://gerrit.wikimedia.org/r/110634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I921badd9616aba21ee04cfdd82ab99de2e85ba70
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: wmf/1.23wmf11
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
