aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2013-11-19 04:26:07 +0000
committerrvelices <rv-github@modusoptimus.com>2013-11-19 04:26:07 +0000
commit5122b6df1ff5496faf57b15e56427a06486c88f1 (patch)
treeda60edb29e52df47d9c0bebc8d816e412b954840 /include
parent83e62f9410245aa9ea2653f6cf1f4265cbfa4230 (diff)
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
Diffstat (limited to '')
-rw-r--r--include/template.class.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/template.class.php b/include/template.class.php
index 32c224581..56ef8cb60 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -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)
{