added an additional filter to remove empty array items (#10803)

* ENH Added filter to remove empty/null from Path::join parts This is to ensure null values are removed and trim() deprecated warnings are not thrown Fixes #10802 * FIX revert public signature Co-authored-by: Steve Boyd <[email protected]> --------- Co-authored-by: Steve Boyd <[email protected]>
silverstripe · Jun 14, 2023 · b6a3e3a · b6a3e3a
1 parent 6fd7694
commit b6a3e3a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Core/Path.php b/src/Core/Path.php
@@ -30,7 +30,7 @@ public static function join(...$parts)
         }
 
         // Cleanup and join all parts
-        $parts = array_filter(array_map('trim', $parts ?? []));
+        $parts = array_filter(array_map('trim', array_filter($parts ?? [])));
         $fullPath = static::normalise(implode(DIRECTORY_SEPARATOR, $parts));
 
         // Protect against directory traversal vulnerability (OTG-AUTHZ-001)