summaryrefslogtreecommitdiff
path: root/program/steps/settings/folders.inc
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-11-06 13:21:04 +0100
committerThomas Bruederli <thomas@roundcube.net>2012-11-06 13:21:04 +0100
commit28de3911825bde79ee5a92762940ef310baab737 (patch)
treecd9b909b722b3e4f7772039fe35cae2be1e9bff9 /program/steps/settings/folders.inc
parent03970bd54936ecbcfe20015897057dab1ffa7c12 (diff)
Recursively resolve paths of iframe contents; unify contentframe registration and reduce code-duplication
Diffstat (limited to 'program/steps/settings/folders.inc')
-rw-r--r--program/steps/settings/folders.inc7
1 files changed, 1 insertions, 6 deletions
diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc
index 12e449e80..0c7d9063f 100644
--- a/program/steps/settings/folders.inc
+++ b/program/steps/settings/folders.inc
@@ -369,12 +369,7 @@ function rcmail_folder_frame($attrib)
if (!$attrib['id'])
$attrib['id'] = 'rcmfolderframe';
- $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);
}
function rcmail_rename_folder($oldname, $newname)