From d8509eb1450a0a3dbf497696e741f89051bb9939 Mon Sep 17 00:00:00 2001 From: Robert Deutz Date: Sat, 27 Apr 2024 17:22:47 +0200 Subject: [PATCH 1/7] add custom css fix 41205 --- libraries/src/HTML/Helpers/Select.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libraries/src/HTML/Helpers/Select.php b/libraries/src/HTML/Helpers/Select.php index f6e8d2d6c01eb..7cdd83d905c7d 100644 --- a/libraries/src/HTML/Helpers/Select.php +++ b/libraries/src/HTML/Helpers/Select.php @@ -631,7 +631,15 @@ public static function radiolist( $idtag = false, $translate = false ) { + $class = ''; + if (\is_array($attribs)) { + + if (array_key_exists('class', $attribs)) { + $class = ' ' . $attribs['class']; + unset($attribs['class']); + } + $attribs = ArrayHelper::toString($attribs); } @@ -662,7 +670,7 @@ public static function radiolist( $extra .= ((string) $k === (string) $selected ? ' checked="checked" ' : ''); } - $html .= ''; $html .= ''; $html .= ''; From 5ef964503ef00d2167ffdc3f6d7916bd30a11020 Mon Sep 17 00:00:00 2001 From: Robert Deutz Date: Sat, 27 Apr 2024 17:59:29 +0200 Subject: [PATCH 2/7] cs fix --- libraries/src/HTML/Helpers/Select.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/HTML/Helpers/Select.php b/libraries/src/HTML/Helpers/Select.php index 7cdd83d905c7d..e15adff2fda34 100644 --- a/libraries/src/HTML/Helpers/Select.php +++ b/libraries/src/HTML/Helpers/Select.php @@ -635,7 +635,7 @@ public static function radiolist( if (\is_array($attribs)) { - if (array_key_exists('class', $attribs)) { + if (\array_key_exists('class', $attribs)) { $class = ' ' . $attribs['class']; unset($attribs['class']); } From a7a7a155044c89641125318201faee6edceceb71 Mon Sep 17 00:00:00 2001 From: Robert Deutz Date: Sun, 28 Apr 2024 16:25:17 +0200 Subject: [PATCH 3/7] Update libraries/src/HTML/Helpers/Select.php Co-authored-by: Richard Fath --- libraries/src/HTML/Helpers/Select.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/src/HTML/Helpers/Select.php b/libraries/src/HTML/Helpers/Select.php index e15adff2fda34..15f94d5fcbd49 100644 --- a/libraries/src/HTML/Helpers/Select.php +++ b/libraries/src/HTML/Helpers/Select.php @@ -670,7 +670,7 @@ public static function radiolist( $extra .= ((string) $k === (string) $selected ? ' checked="checked" ' : ''); } - $html .= ''; $html .= ''; $html .= ''; From 89324881ba52daf937a042b7af0645353df2e0ef Mon Sep 17 00:00:00 2001 From: Robert Deutz Date: Sun, 28 Apr 2024 16:25:24 +0200 Subject: [PATCH 4/7] Update libraries/src/HTML/Helpers/Select.php Co-authored-by: Richard Fath --- libraries/src/HTML/Helpers/Select.php | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/src/HTML/Helpers/Select.php b/libraries/src/HTML/Helpers/Select.php index 15f94d5fcbd49..e0499e43b72b5 100644 --- a/libraries/src/HTML/Helpers/Select.php +++ b/libraries/src/HTML/Helpers/Select.php @@ -634,7 +634,6 @@ public static function radiolist( $class = ''; if (\is_array($attribs)) { - if (\array_key_exists('class', $attribs)) { $class = ' ' . $attribs['class']; unset($attribs['class']); From e41f7e877b5ad778da351d6ac6570ac5a69493d1 Mon Sep 17 00:00:00 2001 From: Robert Deutz Date: Thu, 2 May 2024 11:59:08 +0200 Subject: [PATCH 5/7] pin mysql to 8.3.0 --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index fcc5360d28f84..ed6fc2c16e6bd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -272,7 +272,7 @@ volumes: services: - name: mysql - image: mysql:8 + image: mysql:8.3.0 command: ["--default-authentication-plugin=mysql_native_password"] environment: MYSQL_USER: joomla_ut @@ -415,6 +415,6 @@ trigger: --- kind: signature -hmac: 90d71e1cf5e5dcdb753ea1da6f8b6e571fc82a47994bd856e83c5f30bdd4a2af +hmac: 202c7e5dcafc99ae21d411f2656e406af1496a62b53ac17519c35a08b3883bc4 ... From 863daa22eec6887dd704f29645d570d0094eeaec Mon Sep 17 00:00:00 2001 From: Robert Deutz Date: Thu, 2 May 2024 12:01:37 +0200 Subject: [PATCH 6/7] sign --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index ed6fc2c16e6bd..6f978bfdcd66b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -405,7 +405,6 @@ steps: status: - failure - trigger: event: - cron @@ -415,6 +414,6 @@ trigger: --- kind: signature -hmac: 202c7e5dcafc99ae21d411f2656e406af1496a62b53ac17519c35a08b3883bc4 +hmac: afc5ccde3ab67da78dfe21f7fe22fcd3c69559ee19efbffdf8b7b5b799a1deaa ... From 55eabdd8ce7a60bcba9bda9edb1e07439a5d855a Mon Sep 17 00:00:00 2001 From: Robert Deutz Date: Thu, 2 May 2024 14:55:44 +0200 Subject: [PATCH 7/7] revert drone.yml change --- .drone.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6f978bfdcd66b..fcc5360d28f84 100644 --- a/.drone.yml +++ b/.drone.yml @@ -272,7 +272,7 @@ volumes: services: - name: mysql - image: mysql:8.3.0 + image: mysql:8 command: ["--default-authentication-plugin=mysql_native_password"] environment: MYSQL_USER: joomla_ut @@ -405,6 +405,7 @@ steps: status: - failure + trigger: event: - cron @@ -414,6 +415,6 @@ trigger: --- kind: signature -hmac: afc5ccde3ab67da78dfe21f7fe22fcd3c69559ee19efbffdf8b7b5b799a1deaa +hmac: 90d71e1cf5e5dcdb753ea1da6f8b6e571fc82a47994bd856e83c5f30bdd4a2af ...