From 207d618c22f6e50cf1dff983791282afe9f267ce Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 14 Jun 2012 04:59:12 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/include/rcube_output_html.php | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php
index fce9615..7ceea18 100644
--- a/program/include/rcube_output_html.php
+++ b/program/include/rcube_output_html.php
@@ -68,7 +68,9 @@
$this->set_env('x_frame_options', $this->config->get('x_frame_options', 'sameorigin'));
// load the correct skin (in case user-defined)
- $this->set_skin($this->config->get('skin'));
+ $skin = $this->config->get('skin');
+ $this->set_skin($skin);
+ $this->set_env('skin', $skin);
// add common javascripts
$this->add_script('var '.rcmail::JS_OBJECT_NAME.' = new rcube_webmail();', 'head_top');
--
Gitblit v1.9.1