diff options
Diffstat (limited to 'program/steps/addressbook/func.inc')
-rw-r--r-- | program/steps/addressbook/func.inc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index 98cf29f10..2172f9783 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -152,11 +152,11 @@ function rcmail_contact_frame($attrib) $attrib['id'] = 'rcmcontactframe'; $attrib['name'] = $attrib['id']; - $attrib_str = create_attrib_string($attrib, array('name', 'id', 'class', 'style', 'src', 'width', 'height', 'frameborder')); $OUTPUT->set_env('contentframe', $attrib['name']); $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif'); - return '<iframe'. $attrib_str . '></iframe>'; + + return html::tag('iframe', $attrib); } @@ -169,13 +169,7 @@ function rcmail_rowcount_display($attrib) $OUTPUT->add_gui_object('countdisplay', $attrib['id']); - // allow the following attributes to be added to the <span> tag - $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id')); - - $out = '<span' . $attrib_str . '>'; - $out .= rcmail_get_rowcount_text(); - $out .= '</span>'; - return $out; + return html::span($attrib, rcmail_get_rowcount_text()); } @@ -203,6 +197,7 @@ function rcmail_get_rowcount_text() return $out; } + $OUTPUT->set_pagetitle(rcube_label('addressbook')); // register UI objects |