diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-02-03 11:12:35 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-02-03 11:12:35 +0000 |
| commit | b207b633d597f2f5c958bbdb95a3cf41a0f3879e (patch) | |
| tree | d3589137ec86c4abd14ddaea041888722ff1b3c3 /roundcubemail/program/include | |
| parent | 4f19c51b60bfb40122ff577883c613741572b5d5 (diff) | |
Get rid of global $__skin_path variable (#1488336)
git-svn-id: https://svn.roundcube.net/trunk@5851 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include')
| -rw-r--r-- | roundcubemail/program/include/main.inc | 2 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_template.php | 8 |
2 files changed, 9 insertions, 1 deletions
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 @@ -167,6 +167,14 @@ class rcube_template extends rcube_html_page } /** + * Getter for the current skin path property + */ + public function get_skin_path() + { + return $this->config['skin_path']; + } + + /** * Check if a specific template exists * * @param string Template name |