diff options
| author | rvelices <rv-github@modusoptimus.com> | 2011-04-19 20:09:19 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2011-04-19 20:09:19 +0000 |
| commit | fe593bc2c85ca5f65a1f92870c90e028332ea53e (patch) | |
| tree | a4b2043e850492b5e945f0488101a0d9ead28a53 | |
| parent | 178599659b62c7b9124331e7c0e4c9e5667b4920 (diff) | |
bug:2268 combine_script - sometimes precedent scripts were not being loaded before ...
in admin, the accordion is loaded in the header (admin pages have the same header combined script, but usually different bottom scripts)
git-svn-id: http://piwigo.org/svn/branches/2.2@10504 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | admin/themes/default/template/admin.tpl | 1 | ||||
| -rw-r--r-- | include/template.class.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl index 4fe561cdd..2daad8118 100644 --- a/admin/themes/default/template/admin.tpl +++ b/admin/themes/default/template/admin.tpl @@ -1,3 +1,4 @@ +{combine_script id='jquery.ui.accordion' load='header'}{*we load in the header because the accordion is on every admin page and usually all admin pages use the same header combined script but not the same footer script*} {footer_script require='jquery.ui.accordion'} jQuery(document).ready(function(){ldelim} jQuery('#menubar').accordion({ldelim} diff --git a/include/template.class.php b/include/template.class.php index 1536e8f7a..857314906 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -1101,8 +1101,8 @@ class ScriptLoader foreach( $scripts as $id => $script) { $load = $script->load_mode; - if ($load==0) - continue; + /*if ($load==0) + continue;*/ foreach( $script->precedents as $precedent) { if ( !isset($scripts[$precedent] ) ) |