- Fix bug in rcube_plugin::local_skin_path()

4 files changed, 13 insertions, 12 deletions

diff --git a/program/include/rcube_json_output.php b/program/include/rcube_json_output.php
index 337a82b6e..1ad1ec56c 100644
--- a/program/include/rcube_json_output.php
+++ b/program/include/rcube_json_output.php
@@ -35,13 +35,13 @@ class rcube_json_output
      */
     private $config;
     private $charset = RCMAIL_CHARSET;
-    private $env = array();
     private $texts = array();
     private $commands = array();
     private $callbacks = array();
     private $message = null;
 
     public $browser;
+    public $env = array();
     public $type = 'js';
     public $ajax_call = true;
 
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index 0c7f56648..b356c2239 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -247,7 +247,7 @@ abstract class rcube_plugin
    */
   protected function local_skin_path()
   {
-      $skin_path = 'skins/'.$this->api->output->config['skin'];
+      $skin_path = 'skins/'.$this->api->config->get('skin');
       if (!is_dir(realpath(slashify($this->home) . $skin_path)))
         $skin_path = 'skins/default';
     return $skin_path;
diff --git a/program/include/rcube_plugin_api.php b/program/include/rcube_plugin_api.php
index 2313d6951..da171ecf4 100644
--- a/program/include/rcube_plugin_api.php
+++ b/program/include/rcube_plugin_api.php
@@ -31,6 +31,7 @@ class rcube_plugin_api
   public $dir;
   public $url = 'plugins/';
   public $output;
+  public $config;
   
   public $handlers = array();
   private $plugins = array();
@@ -39,7 +40,6 @@ class rcube_plugin_api
   private $actionmap = array();
   private $objectsmap = array();
   private $template_contents = array();
-  
   private $required_plugins = array('filesystem_attachments');
   private $active_hook = false;
 
@@ -107,6 +107,7 @@ class rcube_plugin_api
   {
     $rcmail = rcmail::get_instance();
     $this->output = $rcmail->output;
+    $this->config = $rcmail->config;
 
     $plugins_dir = dir($this->dir);
     $plugins_dir = unslashify($plugins_dir->path);
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index e9b2b2118..a30c4f3b2 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -30,17 +30,17 @@
  */
 class rcube_template extends rcube_html_page
 {
-    var $app;
-    var $config;
-    var $framed = false;
-    var $pagetitle = '';
-    var $message = null;
-    var $env = array();
-    var $js_env = array();
-    var $js_commands = array();
-    var $object_handlers = array();
+    private $app;
+    private $config;
+    private $pagetitle = '';
+    private $message = null;
+    private $js_env = array();
+    private $js_commands = array();
+    private $object_handlers = array();
 
     public $browser;
+    public $framed = false;
+    public $env = array();
     public $type = 'html';
     public $ajax_call = false;