Changeset 10656


Ignore:
Timestamp:
04/28/11 21:05:40 (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/template.class.php

    r10616 r10656  
    10491049  function get_footer_scripts() 
    10501050  { 
    1051     $this->did_head || trigger_error("Footer scripts before header scripts ?", E_USER_WARNING); 
     1051    if (!$this->did_head) 
     1052    { 
     1053      self::check_load_dep($this->registered_scripts); 
     1054    } 
    10521055    $this->did_footer = true; 
    10531056    $todo = array(); 
Note: See TracChangeset for help on using the changeset viewer.