[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Allow resetting highlight query back to null

2017-12-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398187 )

Change subject: Allow resetting highlight query back to null
..


Allow resetting highlight query back to null

Change-Id: Ia40a7c0c9e016ee2a9883b66da094ad3c1b7bd90
---
M includes/Search/SearchContext.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  DCausse: Looks good to me, approved



diff --git a/includes/Search/SearchContext.php 
b/includes/Search/SearchContext.php
index cbdc984..b656fa9 100644
--- a/includes/Search/SearchContext.php
+++ b/includes/Search/SearchContext.php
@@ -529,7 +529,7 @@
 * @param AbstractQuery $query Query that should be used for 
highlighting if different
 *  from the query used for selecting.
 */
-   public function setHighlightQuery( AbstractQuery $query ) {
+   public function setHighlightQuery( AbstractQuery $query = null ) {
$this->isDirty = true;
$this->highlightQuery = $query;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/398187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia40a7c0c9e016ee2a9883b66da094ad3c1b7bd90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Allow resetting highlight query back to null

2017-12-13 Thread Smalyshev (Code Review) 
Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398187 )

Change subject: Allow resetting highlight query back to null
..

Allow resetting highlight query back to null

Change-Id: Ia40a7c0c9e016ee2a9883b66da094ad3c1b7bd90
---
M includes/Search/SearchContext.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/87/398187/1

diff --git a/includes/Search/SearchContext.php 
b/includes/Search/SearchContext.php
index cbdc984..b656fa9 100644
--- a/includes/Search/SearchContext.php
+++ b/includes/Search/SearchContext.php
@@ -529,7 +529,7 @@
 * @param AbstractQuery $query Query that should be used for 
highlighting if different
 *  from the query used for selecting.
 */
-   public function setHighlightQuery( AbstractQuery $query ) {
+   public function setHighlightQuery( AbstractQuery $query = null ) {
$this->isDirty = true;
$this->highlightQuery = $query;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/398187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia40a7c0c9e016ee2a9883b66da094ad3c1b7bd90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits