Revert "group the scripts". Apparently this is bad.

This reverts commit 59a17792f5cd1c05e9c4e5c8dc7cb4b9332f1318.
This commit is contained in:
Shish 2012-02-12 11:43:26 +00:00
parent 59a17792f5
commit 0984ebd062

View File

@ -240,6 +240,8 @@ class Page {
$data_href = get_base_href(); $data_href = get_base_href();
$theme_name = $config->get_string('theme', 'default'); $theme_name = $config->get_string('theme', 'default');
$this->add_html_header("<script type='text/javascript'>base_href = '$data_href';</script>");
if(file_exists("themes/$theme_name/favicon.ico")) { if(file_exists("themes/$theme_name/favicon.ico")) {
$this->add_html_header("<link rel='icon' href='$data_href/themes/$theme_name/favicon.ico'>"); $this->add_html_header("<link rel='icon' href='$data_href/themes/$theme_name/favicon.ico'>");
$this->add_html_header("<link rel='shortcut icon' href='$data_href/themes/$theme_name/favicon.ico'>"); $this->add_html_header("<link rel='shortcut icon' href='$data_href/themes/$theme_name/favicon.ico'>");
@ -265,8 +267,6 @@ class Page {
} }
} }
$this->add_html_header("<script type='text/javascript'>base_href = '$data_href';</script>");
foreach(glob("lib/*.js") as $js) { foreach(glob("lib/*.js") as $js) {
$this->add_html_header('<script src="'.$data_href.'/'.$js.'" type="text/javascript"></script>'); $this->add_html_header('<script src="'.$data_href.'/'.$js.'" type="text/javascript"></script>');
} }