aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--admin/themes/default/template/header.tpl2
-rw-r--r--include/template.class.php6
2 files changed, 5 insertions, 3 deletions
diff --git a/admin/themes/default/template/header.tpl b/admin/themes/default/template/header.tpl
index b2ef91944..4da026cf3 100644
--- a/admin/themes/default/template/header.tpl
+++ b/admin/themes/default/template/header.tpl
@@ -25,7 +25,7 @@
{get_combined_scripts load='header'}
<!-- END get_combined_scripts -->
-{combine_script id='jquery' path='themes/default/js/jquery.packed.js}
+{combine_script id='jquery' path='themes/default/js/jquery.packed.js'}
<!--[if lt IE 7]>
<script type="text/javascript" src="{$ROOT_URL}themes/default/js/pngfix.js"></script>
diff --git a/include/template.class.php b/include/template.class.php
index c1bdc67fa..afc955096 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -822,14 +822,16 @@ class PwgTemplateAdapter
final class Script
{
+ public $id;
public $load_mode;
public $precedents = array();
public $path;
public $version;
public $extra = array();
- function Script($load_mode, $precedents, $path, $version)
+ function Script($id, $load_mode, $precedents, $path, $version)
{
+ $this->id = $id;
$this->load_mode = $load_mode;
$this->precedents = $precedents;
$this->path = $path;
@@ -899,7 +901,7 @@ class ScriptLoader
}
if (! isset( $this->registered_scripts[$id] ) )
{
- $script = new Script($load_mode, $require, $path, $version);
+ $script = new Script($id, $load_mode, $require, $path, $version);
self::fill_well_known($id, $script);
$this->registered_scripts[$id] = $script;
}