bug 2963: Ability to create css/js smarty templates - fixes (last I hope)

git-svn-id: http://piwigo.org/svn/trunk@25568 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2013-11-19 04:26:07 +00:00
parent 83e62f9410
commit 5122b6df1f
+2 -2
View File
@@ -750,7 +750,7 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
$params['id'] = md5($params['path']);
}
$this->cssLoader->add($params['id'], $params['path'], (int)@$params['version'], (int)@$params['order'], (bool)@$params['template']);
$this->cssLoader->add($params['id'], $params['path'], isset($params['version']) ? $params['version'] : 0, (int)@$params['order'], (bool)@$params['template']);
}
function func_get_combined_css($params)
@@ -1437,7 +1437,7 @@ final class FileCombiner
return $result;
}
private function flush_pending(&$result, $pending, $key, $force)
private function flush_pending(&$result, &$pending, $key, $force)
{
if (count($pending)>1)
{