Changeset 10656

Timestamp:

Apr 28, 2011, 9:05:40 PM (13 years ago)

Author:

rvelices

Message:

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)

File:

• trunk/include/template.class.php (modified) (1 diff)

trunk/include/template.class.php

@@ -1049 +1049 @@
   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();