Fix PHP warning (#9611)

roundcube · Sep 7, 2024 · e36dd3a · e36dd3a
1 parent 4ca1984
commit e36dd3a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -59,7 +59,7 @@
 - Fix attachment name decoding when 'charset' parameter exists in the headers (#9376)
 - Fix deprecated (in PHP 8.4) use of session_set_save_handler() (#9060)
 - Fix potential HTTP protocol version mismatch (#8982)
-- 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
@@ -1186,7 +1186,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);