Merge remote-tracking branch '33533/patch-1' into Aug01-comprs

engcom-Charlie · engcom-Charlie · commit 53c9d62260af · 2025-08-19T16:12:37.000+05:30
diff --git a/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php b/app/code/Magento/CatalogSearch/Model/Adminhtml/System/Config/Backend/Engine.php
@@ -61,8 +61,7 @@ public function beforeSave()
         parent::beforeSave();
         $value = (string)$this->getValue();
         if (empty($value)) {
-            $defaultCountry = $this->engineResolver->getCurrentSearchEngine();
-            $this->setValue($defaultCountry);
+            $this->setValue($this->engineResolver->getCurrentSearchEngine());
         }
         return $this;
     }

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,7 @@ public function beforeSave()`
`61`	`61`	`parent::beforeSave();`
`62`	`62`	`$value = (string)$this->getValue();`
`63`	`63`	`if (empty($value)) {`
`64`		`- $defaultCountry = $this->engineResolver->getCurrentSearchEngine();`
`65`		`- $this->setValue($defaultCountry);`
	`64`	`+ $this->setValue($this->engineResolver->getCurrentSearchEngine());`
`66`	`65`	`}`
`67`	`66`	`return $this;`
`68`	`67`	`}`