diff options
| author | thomascube <thomas@roundcube.net> | 2009-04-19 17:44:29 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2009-04-19 17:44:29 +0000 |
| commit | cc97ea0559af1a92a54dbcdf738ee4d95e67d3ff (patch) | |
| tree | f9e18128e5a90abb06f079b09f8cd9ed92044faf /program/include/rcube_html_page.php | |
| parent | fb253ee9a89e2da779d11058f1f0c63c314b2840 (diff) | |
Merged branch devel-api (from r2208 to r2387) back into trunk (omitting some sample plugins)
Diffstat (limited to 'program/include/rcube_html_page.php')
| -rw-r--r-- | program/include/rcube_html_page.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php index 78f6176bf..c83c6aeea 100644 --- a/program/include/rcube_html_page.php +++ b/program/include/rcube_html_page.php @@ -31,8 +31,8 @@ class rcube_html_page protected $scripts = array(); protected $charset = 'UTF-8'; - protected $script_tag_file = "<script type=\"text/javascript\" src=\"%s%s\"></script>\n"; - protected $script_tag = "<script type=\"text/javascript\">\n<!--\n%s\n\n//-->\n</script>\n"; + protected $script_tag_file = "<script type=\"text/javascript\" src=\"%s\"></script>\n"; + protected $script_tag = "<script type=\"text/javascript\">\n/* <![CDATA[ */\n%s\n/* ]]> */\n</script>"; protected $default_template = "<html>\n<head><title></title></head>\n<body></body>\n</html>"; protected $title = ''; @@ -53,6 +53,9 @@ class rcube_html_page public function include_script($file, $position='head') { static $sa_files = array(); + + if (!ereg('^https?://', $file) && $file[0] != '/') + $file = $this->scripts_path . $file; if (in_array($file, $sa_files)) { return; @@ -165,7 +168,7 @@ class rcube_html_page // definition of the code to be placed in the document header and footer if (is_array($this->script_files['head'])) { foreach ($this->script_files['head'] as $file) { - $__page_header .= sprintf($this->script_tag_file, $this->scripts_path, $file); + $__page_header .= sprintf($this->script_tag_file, $file); } } @@ -180,7 +183,7 @@ class rcube_html_page if (is_array($this->script_files['foot'])) { foreach ($this->script_files['foot'] as $file) { - $__page_footer .= sprintf($this->script_tag_file, $this->scripts_path, $file); + $__page_footer .= sprintf($this->script_tag_file, $file); } } |