Fix faulty slash in condition

pimcore · Dec 16, 2024 · bd0130e · bd0130e
1 parent 03484c0
commit bd0130e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Helper/GridHelperService.php b/src/Helper/GridHelperService.php
@@ -935,7 +935,7 @@ private function optimizedConcatLike(string $fullpath): string
         return '(
             (`path` = "' . $path . '/" AND `key` = "' . $leaf . '")
             OR
-            `path` LIKE "' . $fullpath . '/%"
+            `path` LIKE "' . $fullpath . '%"
         )';
     }
 
@@ -999,11 +999,11 @@ protected function getPermittedPathsByUser(string $type, User $user): string
             // the result would be like `(((path1 OR path2) AND (not_path3 AND not_path4)))`
             $forbiddenAndAllowedSql = '(';
 
-            if ($allowedPathSql || $forbiddenPathSql) {
+            if (!empty($allowedPathSql) || !empty($forbiddenPathSql)) {
                 $forbiddenAndAllowedSql .= '(';
                 $forbiddenAndAllowedSql .= $allowedPathSql ? '( ' . implode(' OR ', $allowedPathSql) . ' )' : '';
 
-                if ($forbiddenPathSql) {
+                if (!empty($forbiddenPathSql)) {
                     //if $allowedPathSql "implosion" is present, we need `AND` in between
                     $forbiddenAndAllowedSql .= $allowedPathSql ? ' AND ' : '';
                     $forbiddenAndAllowedSql .= implode(' AND ', $forbiddenPathSql);