From b0f5bd822ae134dfdf67953431c841280d1ec347 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Thu, 28 Apr 2011 19:05:40 +0000
Subject: 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
---
 include/template.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'include')

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)
-- 
cgit v1.2.3