Commit 787811dc authored by Bas de Nooijer's avatar Bas de Nooijer

merge of fix in the development branch

parents dde0171e f715ddb7
...@@ -183,16 +183,16 @@ class FacetSet extends RequestBuilder ...@@ -183,16 +183,16 @@ class FacetSet extends RequestBuilder
$request->addParam("f.$field.facet.range.gap", $facet->getGap()); $request->addParam("f.$field.facet.range.gap", $facet->getGap());
$request->addParam("f.$field.facet.range.hardend", $facet->getHardend()); $request->addParam("f.$field.facet.range.hardend", $facet->getHardend());
if ($facet->getInclude() !== null) { if (null !== $facet->getOther()) {
$other = explode(',', $facet->getOther()); $other = explode(',', $facet->getOther());
foreach ($other as $otherValue) { foreach ($other AS $otherValue) {
$request->addParam("f.$field.facet.range.other", trim($otherValue)); $request->addParam("f.$field.facet.range.other", trim($otherValue));
} }
} }
if ($facet->getInclude() !== null) { if (null !== $facet->getOther()) {
$include = explode(',', $facet->getInclude()); $include = explode(',', $facet->getInclude());
foreach ($include as $includeValue) { foreach ($include AS $includeValue) {
$request->addParam("f.$field.facet.range.include", trim($includeValue)); $request->addParam("f.$field.facet.range.include", trim($includeValue));
} }
} }
......
...@@ -121,7 +121,7 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase ...@@ -121,7 +121,7 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
); );
} }
public function testBuildWithRangeFacetNoIncludeNoOther() public function testBuildWithRangeFacetExcludingOptionalParams()
{ {
$this->component->addFacet(new FacetRange( $this->component->addFacet(new FacetRange(
array( array(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment