archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge -r10655 from branch 2.2 to trunk

Browse source 
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
This commit is contained in:
rvelices 2011-04-28 19:05:40 +00:00
commit b0f5bd822a
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/template.class.php
View file

@ -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)