tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '4.13' into 4

This commit is contained in:
Steve Boyd 2023-06-14 16:08:53 +12:00
parent ca542a386b b6a3e3a951
commit c2c5db0da0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Path.php
View File

@ -30,7 +30,7 @@ class Path
}
// 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)

2
src/Dev/Tasks/i18nTextCollectorTask.php
View File

@ -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)
";
/**