diff options
| author | thomascube <thomas@roundcube.net> | 2012-02-03 11:12:35 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2012-02-03 11:12:35 +0000 |
| commit | fc7b5b8283173ebb5209da124e5b283e5b86dfa7 (patch) | |
| tree | 644a09bf21831f5a7079dfef7d5d3a68dd0dd95a | |
| parent | 43875379d5fcfc4e4d29e2edcbbed614a2050f7d (diff) | |
Get rid of global $__skin_path variable (#1488336)
| -rw-r--r-- | program/include/main.inc | 2 | ||||
| -rw-r--r-- | program/include/rcube_template.php | 8 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index 8b935c1f3..35c2df4c7 100644 --- a/program/include/main.inc +++ b/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/program/include/rcube_template.php b/program/include/rcube_template.php index 0fbd9dfac..94fa6763c 100644 --- a/program/include/rcube_template.php +++ b/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 diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 6b2fa7b2b..cbef36884 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -775,7 +775,7 @@ function rcmail_compose_body($attrib) $OUTPUT->include_script('googiespell.js'); $OUTPUT->add_script(sprintf( - "var googie = new GoogieSpell('\$__skin_path/images/googiespell/','?_task=utils&_action=spell&lang=', %s);\n". + "var googie = new GoogieSpell('%s/images/googiespell/','%s&lang=', %s);\n". "googie.lang_chck_spell = \"%s\";\n". "googie.lang_rsm_edt = \"%s\";\n". "googie.lang_close = \"%s\";\n". @@ -787,6 +787,8 @@ function rcmail_compose_body($attrib) "googie.setSpellContainer('spellcheck-control');\n". "googie.decorateTextarea('%s');\n". "%s.set_env('spellcheck', googie);", + $RCMAIL->output->get_skin_path(), + $RCMAIL->url(array('_task' => 'utils', '_action' => 'spell')), !empty($dictionary) ? 'true' : 'false', JQ(Q(rcube_label('checkspelling'))), JQ(Q(rcube_label('resumeediting'))), |