diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2013-10-25 16:50:25 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2013-10-25 16:50:25 +0200 |
| commit | 98b7b548a229600f7653cd67d9aae43675938143 (patch) | |
| tree | 15c141db332b9ae87ef3fbf573ea32d30dc1ea76 /program/include/rcmail_output_html.php | |
| parent | 4e4c2511bc00cfc0214acab63b097efe142187a7 (diff) | |
| parent | 9c41ba3c9ebbb14d01abe961c420f71f9463e61a (diff) | |
Merge branch 'dev-canned-responses'
Conflicts (resolved):
skins/classic/includes/settingstabs.html
skins/larry/includes/settingstabs.html
Diffstat (limited to 'program/include/rcmail_output_html.php')
| -rw-r--r-- | program/include/rcmail_output_html.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 6651a9461..0c95fbc0e 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -1184,7 +1184,7 @@ class rcmail_output_html extends rcmail_output // generate html code for button if ($btn_content) { - $attrib_str = html::attrib_string($attrib, $link_attrib); + $attrib_str = html::attrib_string($attrib, array_merge(html::$common_attrib, $link_attrib)); $out = sprintf('<a%s>%s</a>', $attrib_str, $btn_content); } |