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/branches/2.2@10655 68402e56-0260-453c-a942-63ccdbb3a9ee

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)