aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2011-04-19 20:08:34 +0000
committerrvelices <rv-github@modusoptimus.com>2011-04-19 20:08:34 +0000
commit13f099f128b1d3af6d37c3e566fae60c38e93971 (patch)
treec9de84fb8a2c469b20e9b975e5c96fef08bb0217
parent9b0677ec33b7391c577b48bd5ecbd0fd4ca905d5 (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/trunk@10503 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/themes/default/template/admin.tpl1
-rw-r--r--include/template.class.php4
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] ) )