From b207b633d597f2f5c958bbdb95a3cf41a0f3879e Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Fri, 3 Feb 2012 11:12:35 +0000
Subject: Get rid of global $__skin_path variable (#1488336)

git-svn-id: https://svn.roundcube.net/trunk@5851 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/main.inc           | 2 +-
 roundcubemail/program/include/rcube_template.php | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'roundcubemail/program/include')

diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index 8b935c1f3..35c2df4c7 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -1379,8 +1379,8 @@ function rcube_html_editor($mode='')
   $RCMAIL->output->add_script(sprintf("rcmail_editor_init(%s)",
     json_encode(array(
         'mode'       => $mode,
-        'skin_path'  => '$__skin_path',
         'lang'       => $lang,
+        'skin_path'  => $RCMAIL->output->get_skin_path(),
         'spellcheck' => intval($RCMAIL->config->get('enable_spellcheck')),
         'spelldict'  => intval($RCMAIL->config->get('spellcheck_dictionary')),
     ))), 'foot');
diff --git a/roundcubemail/program/include/rcube_template.php b/roundcubemail/program/include/rcube_template.php
index 0fbd9dfac..94fa6763c 100644
--- a/roundcubemail/program/include/rcube_template.php
+++ b/roundcubemail/program/include/rcube_template.php
@@ -166,6 +166,14 @@ class rcube_template extends rcube_html_page
         return $valid;
     }
 
+    /**
+     * Getter for the current skin path property
+     */
+    public function get_skin_path()
+    {
+        return $this->config['skin_path'];
+    }
+
     /**
      * Check if a specific template exists
      *
-- 
cgit v1.2.3