diff options
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/main.inc | 5 | ||||
| -rw-r--r-- | program/include/rcube_shared.inc | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index f1102d7e1..364bfd50e 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -321,8 +321,9 @@ function load_gui() $javascript .= "$JS_OBJECT_NAME.set_env('framed', true);\n"; $OUTPUT->add_script($javascript); - $OUTPUT->include_script('program/js/common.js'); - $OUTPUT->include_script('program/js/app.js'); + $OUTPUT->include_script('common.js'); + $OUTPUT->include_script('app.js'); + $OUTPUT->scripts_path = 'program/js/'; // set locale setting rcmail_set_locale($sess_user_lang); diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc index 77753f5b4..fe1a560a3 100644 --- a/program/include/rcube_shared.inc +++ b/program/include/rcube_shared.inc @@ -193,6 +193,7 @@ class rcube_html_page // correct absolute pathes in images and other tags $output = preg_replace('/(src|href|background)=(["\']?)(\/[a-z0-9_\-]+)/Ui', "\\1=\\2$base_path\\3", $output); + $output = str_replace('$__skin_path', $base_path, $output); print rcube_charset_convert($output, 'UTF-8', $this->charset); } |