[MediaWiki-commits] [Gerrit] Skip combining highlights correctly - change (mediawiki...CirrusSearch)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Skip combining highlights correctly
..


Skip combining highlights correctly

The old code worked but it tried to combine highlights using the plain
highlighter which doesn't work.

Change-Id: I18a52d07f14cc76b70ad7f498ef3e3da6dd22bf8
---
M includes/ResultsType.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/ResultsType.php b/includes/ResultsType.php
index 354c359..392b45a 100644
--- a/includes/ResultsType.php
+++ b/includes/ResultsType.php
@@ -115,7 +115,7 @@
private function addMatchedFields( $fields ) {
foreach ( $fields as $name => $config ) {
// TODO remove when Elasticsearch issue 3757 is fixed
-   if ( strpos( $name, '.plain' ) !== false ) {
+   if ( $config[ 'type' ] !== 'fvh' ) {
continue;
}
$config[ 'matched_fields' ] = array( $name, 
"$name.plain" );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18a52d07f14cc76b70ad7f498ef3e3da6dd22bf8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Skip combining highlights correctly - change (mediawiki...CirrusSearch)

2014-01-08 Thread Manybubbles (Code Review) 
Manybubbles has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/106261


Change subject: Skip combining highlights correctly
..

Skip combining highlights correctly

The old code worked but it tried to combine highlights using the plain
highlighter which doesn't work.

Change-Id: I18a52d07f14cc76b70ad7f498ef3e3da6dd22bf8
---
M includes/ResultsType.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/ResultsType.php b/includes/ResultsType.php
index 354c359..392b45a 100644
--- a/includes/ResultsType.php
+++ b/includes/ResultsType.php
@@ -115,7 +115,7 @@
private function addMatchedFields( $fields ) {
foreach ( $fields as $name => $config ) {
// TODO remove when Elasticsearch issue 3757 is fixed
-   if ( strpos( $name, '.plain' ) !== false ) {
+   if ( $config[ 'type' ] !== 'fvh' ) {
continue;
}
$config[ 'matched_fields' ] = array( $name, 
"$name.plain" );

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

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

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