Merge branch '4' into 5.0

silverstripe · Jun 14, 2023 · cfda51a · cfda51a
2 parents 6c266ec + c2c5db0
commit cfda51a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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)

diff --git a/src/Dev/Tasks/i18nTextCollectorTask.php b/src/Dev/Tasks/i18nTextCollectorTask.php
@@ -27,7 +27,7 @@ class i18nTextCollectorTask extends BuildTask
 		- locale: Sets default locale
 		- writer: Custom writer class (defaults to i18nTextCollector_Writer_RailsYaml)
 		- module: One or more modules to limit collection (comma-separated)
-		- merge: Merge new strings with existing ones already defined in language files (default: FALSE)
+		- merge: Merge new strings with existing ones already defined in language files (default: TRUE)
 	";
 
     /**