summaryrefslogtreecommitdiff
path: root/program/include/rcube_output_html.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-11-06 14:57:42 +0100
committerAleksander Machniak <alec@alec.pl>2012-11-06 14:57:42 +0100
commite0f7b920d5b2b94f3ab846e9d4b13f25dd4cc55e (patch)
treea1b0e064cf949a0bafd416fa35d920d1d95e870e /program/include/rcube_output_html.php
parent789baafb2ab5b5eadedfac3cc8a85521d8757bf3 (diff)
Allow setting contentframe from template (as frame object attribute)
Diffstat (limited to 'program/include/rcube_output_html.php')
-rw-r--r--program/include/rcube_output_html.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php
index b0fc81764..e67a4919a 100644
--- a/program/include/rcube_output_html.php
+++ b/program/include/rcube_output_html.php
@@ -1389,8 +1389,8 @@ class rcube_output_html extends rcube_output
$attrib['src'] = $attrib['src'] ? $this->abs_url($attrib['src'], true) : 'program/resources/blank.gif';
// register as 'contentframe' object
- if ($is_contentframe) {
- $this->set_env('contentframe', $attrib['name']);
+ if ($is_contentframe || $attrib['contentframe']) {
+ $this->set_env('contentframe', $attrib['contentframe'] ? $attrib['contentframe'] : $attrib['name']);
$this->set_env('blankpage', $attrib['src']);
}