diff options
author | Thomas Bruederli <thomas@roundcube.net> | 2012-11-06 13:21:04 +0100 |
---|---|---|
committer | Thomas Bruederli <thomas@roundcube.net> | 2012-11-06 13:21:04 +0100 |
commit | 28de3911825bde79ee5a92762940ef310baab737 (patch) | |
tree | cd9b909b722b3e4f7772039fe35cae2be1e9bff9 /program/steps/addressbook | |
parent | 03970bd54936ecbcfe20015897057dab1ffa7c12 (diff) |
Recursively resolve paths of iframe contents; unify contentframe registration and reduce code-duplication
Diffstat (limited to 'program/steps/addressbook')
-rw-r--r-- | program/steps/addressbook/func.inc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index 3a0508025..cefe49e01 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -367,12 +367,7 @@ function rcmail_contact_frame($attrib) if (!$attrib['id']) $attrib['id'] = 'rcmcontactframe'; - $attrib['name'] = $attrib['id']; - - $OUTPUT->set_env('contentframe', $attrib['name']); - $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/resources/blank.gif'); - - return html::iframe($attrib); + return $OUTPUT->frame($attrib, true); } |