From 2a39de413ca7023350a338087976e0481a319d9a Mon Sep 17 00:00:00 2001 From: thomasb Date: Tue, 18 Jan 2011 18:00:57 +0000 Subject: Merge branch devel-addressbook (r4193:4382) back into trunk git-svn-id: https://svn.roundcube.net/trunk@4424 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_template.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'roundcubemail/program/include/rcube_template.php') diff --git a/roundcubemail/program/include/rcube_template.php b/roundcubemail/program/include/rcube_template.php index 2aa16f098..1d1a95b90 100755 --- a/roundcubemail/program/include/rcube_template.php +++ b/roundcubemail/program/include/rcube_template.php @@ -996,8 +996,11 @@ class rcube_template extends rcube_html_page $attrib['action'] = './'; // we already have a
tag - if ($attrib['form']) + if ($attrib['form']) { + if ($this->framed || !empty($_REQUEST['_framed'])) + $hidden->add(array('name' => '_framed', 'value' => '1')); return $hidden->show() . $content; + } else return $this->form_tag($attrib, $hidden->show() . $content); } -- cgit v1.2.3