Merge branch 'hotfix/v2.1.28'

roadiz · Jul 19, 2023 · fea1b54 · fea1b54
2 parents 5c831d3 + 878e887
commit fea1b54
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [v2.1.28](https://github.com/roadiz/core-bundle-dev-app/compare/v2.1.27...v2.1.28) (2023-07-19)
+
+
+### Bug Fixes
+
+* **Search:** Fixed node advanced search using `__node__` prefix ([bcb7d5d](https://github.com/roadiz/core-bundle-dev-app/commit/bcb7d5d9ad6df9e4c580bf4382dd34824ff3e7ea))
+
 ## [v2.1.27](https://github.com/roadiz/core-bundle-dev-app/compare/v2.1.26...v2.1.27) (2023-07-12)
 
 

diff --git a/lib/RoadizCoreBundle/config/services.yaml b/lib/RoadizCoreBundle/config/services.yaml
@@ -1,6 +1,6 @@
 ---
 parameters:
-    roadiz_core.cms_version: '2.1.27'
+    roadiz_core.cms_version: '2.1.28'
     roadiz_core.cms_version_prefix: 'main'
     env(APP_NAMESPACE): "roadiz"
     env(APP_VERSION): "0.1.0"

diff --git a/lib/Rozier/src/Controllers/SearchController.php b/lib/Rozier/src/Controllers/SearchController.php
@@ -383,8 +383,10 @@ protected function handleNodeForm(FormInterface $form, NodeType $nodetype): ?Res
                     || (is_array($value) && isset($value["compareDate"]))
                     || (is_array($value) && $value != [] && !isset($value["compareOp"]))
                 ) {
-                    if (strstr($key, "__node__") == 0) {
-                        $data[str_replace("__node__", "node.", $key)] = $value;
+                    if (\is_string($key) & \str_contains($key, "__node__")) {
+                        /** @var string $newKey */
+                        $newKey = \str_replace("__node__", "node.", $key);
+                        $data[$newKey] = $value;
                     } else {
                         $data[$key] = $value;
                     }