From 35a8d79f624623527682eb3920327ca8aeb0b5cf Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 14 Jun 2023 11:25:34 +1200 Subject: [PATCH 1/2] FIX Show correct default value --- src/Dev/Tasks/i18nTextCollectorTask.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Dev/Tasks/i18nTextCollectorTask.php b/src/Dev/Tasks/i18nTextCollectorTask.php index c552268ac9d..8ecd4b279b7 100644 --- 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) "; /** From b6a3e3a9519e0adc52fb1bd75e1f4974a554c011 Mon Sep 17 00:00:00 2001 From: josephlewisnz <57464168+josephlewisnz@users.noreply.github.com> Date: Wed, 14 Jun 2023 15:46:23 +1200 Subject: [PATCH 2/2] 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 --------- Co-authored-by: Steve Boyd --- src/Core/Path.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core/Path.php b/src/Core/Path.php index 8ca98f4c487..ac19475ba26 100644 --- 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)