aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2011-04-28 19:05:40 +0000
committerrvelices <rv-github@modusoptimus.com>2011-04-28 19:05:40 +0000
commitb0f5bd822ae134dfdf67953431c841280d1ec347 (patch)
tree7d0a72e9541ea4437531cda58e71a1bd10f6ba49
parente63d69390595c7503df9be091a88710d412bb8b7 (diff)
merge -r10655 from branch 2.2 to trunk
get_combined_scripts footer and header can be now in the same tpl file (warning before and not working properly) git-svn-id: http://piwigo.org/svn/trunk@10656 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/template.class.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/template.class.php b/include/template.class.php
index 6e9253723..5a79bbfb6 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -1048,7 +1048,10 @@ class ScriptLoader
function get_footer_scripts()
{
- $this->did_head || trigger_error("Footer scripts before header scripts ?", E_USER_WARNING);
+ if (!$this->did_head)
+ {
+ self::check_load_dep($this->registered_scripts);
+ }
$this->did_footer = true;
$todo = array();
foreach( $this->registered_scripts as $id => $script)