MAGETWO-44555: Exception in Advanced Search if used special symbols

aohorodnyk · aohorodnyk · commit 8b13f99228b3 · 2015-10-26T15:36:45.000+02:00
- Removed now used variable
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -166,7 +166,6 @@ public function __construct(
     public function addFilters($values)
     {
         $attributes = $this->getAttributes();
-        $hasConditions = false;
         $allConditions = [];
 
         foreach ($attributes as $attribute) {
@@ -225,7 +224,7 @@ public function addFilters($values)
         if ($allConditions) {
             $this->_registry->register('advanced_search_conditions', $allConditions);
             $this->getProductCollection()->addFieldsToFilter($allConditions);
-        } elseif (!$hasConditions) {
+        } else {
             throw new LocalizedException(__('Please specify at least one search term.'));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,6 @@ public function __construct(`
`166`	`166`	`public function addFilters($values)`
`167`	`167`	`{`
`168`	`168`	`$attributes = $this->getAttributes();`
`169`		`- $hasConditions = false;`
`170`	`169`	`$allConditions = [];`
`171`	`170`
`172`	`171`	`foreach ($attributes as $attribute) {`
`@@ -225,7 +224,7 @@ public function addFilters($values)`
`225`	`224`	`if ($allConditions) {`
`226`	`225`	`$this->_registry->register('advanced_search_conditions', $allConditions);`
`227`	`226`	`$this->getProductCollection()->addFieldsToFilter($allConditions);`
`228`		`- } elseif (!$hasConditions) {`
	`227`	`+ } else {`
`229`	`228`	`throw new LocalizedException(__('Please specify at least one search term.'));`
`230`	`229`	`}`
`231`	`230`