From 59cdb433a6880b764cdf7631d6cc0b7fde585287 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Tue, 29 Oct 2013 09:11:49 +0100 Subject: Avoid duplicate elements with the same id in HTML. Fixes broken icons in classic skin. --- program/include/rcmail_output_html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 0c95fbc0e..8a960673d 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -1165,7 +1165,7 @@ class rcmail_output_html extends rcmail_output } else if ($attrib['type'] == 'link') { $btn_content = isset($attrib['content']) ? $attrib['content'] : ($attrib['label'] ? $attrib['label'] : $attrib['command']); - $link_attrib = array('href', 'onclick', 'title', 'id', 'class', 'style', 'tabindex', 'target'); + $link_attrib = array_merge(html::$common_attrib, array('href', 'onclick', 'tabindex', 'target')); if ($attrib['innerclass']) $btn_content = html::span($attrib['innerclass'], $btn_content); } @@ -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, array_merge(html::$common_attrib, $link_attrib)); + $attrib_str = html::attrib_string($attrib, $link_attrib); $out = sprintf('%s', $attrib_str, $btn_content); } -- cgit v1.2.3