summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-02-10 15:31:39 +0100
committerThomas Bruederli <thomas@roundcube.net>2013-02-10 16:03:18 +0100
commitdf229677457d1f59d08c14990514273114fed87d (patch)
treec5d6a66c4058f32779208f7a4aa21555293cb840 /program
parent0016cde2fe143643e95a878c53b1c95b318d5aa4 (diff)
Let some env variables survive reset(); don't show taskbar and top line in framed error pages (#1488938)
Diffstat (limited to 'program')
-rw-r--r--program/include/rcmail_output_html.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index f6c5d919d..2babe1cbb 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -80,6 +80,8 @@ class rcmail_output_html extends rcmail_output
if (!empty($_REQUEST['_extwin']))
$this->set_env('extwin', 1);
+ if ($this->framed || !empty($_REQUEST['_framed']))
+ $this->set_env('framed', 1);
// add common javascripts
$this->add_script('var '.self::JS_OBJECT_NAME.' = new rcube_webmail();', 'head_top');
@@ -308,8 +310,12 @@ class rcmail_output_html extends rcmail_output
*/
public function reset()
{
+ $env = array_intersect_key($this->env, array('extwin'=>1, 'framed'=>1));
+
parent::reset();
- $this->js_env = array();
+
+ // let some env variables survive
+ $this->env = $this->js_env = $env;
$this->js_labels = array();
$this->js_commands = array();
$this->script_files = array();