Fix PHP warning (#9611)

roundcube · Sep 7, 2024 · 602a989 · 602a989
1 parent f3c526e
commit 602a989
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## Unreleased
 
 - OAuth: Support standard authentication with short-living password received with OIDC token (#9530)
-- Fix PHP deprecation warnings (#9616)
+- Fix PHP warnings (#9616, #9611)
 
 ## Release 1.6.9
 

diff --git a/program/actions/mail/index.php b/program/actions/mail/index.php
@@ -1189,7 +1189,11 @@ public static function washtml_callback($tagname, $attrib, $content, $washtml)
                     $style[$idx] = $idx . ': ' . $val;
                 }
 
-                $attrs['style'] = ($attrs['style'] ? trim($attrs['style'], ';') . '; ' : '') . implode('; ', $style);
+                if (isset($attrs['style'])) {
+                    $attrs['style'] = trim($attrs['style'], '; ') . '; ' . implode('; ', $style);
+                } else {
+                    $attrs['style'] = implode('; ', $style);
+                }
             }
 
             $out = html::tag('div', $attrs, $content);