From d5d3c70ea0a16af0acf9aefa5152f63cbafa96b2 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 13 Jun 2012 09:15:09 -0400
Subject: [PATCH] Set skin in js environment

---
 program/include/rcube_template.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index adeaaef..e779f5a 100644
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -77,7 +77,9 @@
         $this->set_env('x_frame_options', $this->app->config->get('x_frame_options', 'sameorigin'));
 
         // load the correct skin (in case user-defined)
-        $this->set_skin($this->config['skin']);
+        $skin = $this->app->config->get('skin', 'default');
+        $this->set_skin($skin);
+        $this->set_env('skin', $skin);
 
         // add common javascripts
         $this->add_script('var '.JS_OBJECT_NAME.' = new rcube_webmail();', 'head_top');

--
Gitblit v1.9.1