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

…ope) git-svn-id: http://piwigo.org/svn/trunk@25568 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Nov 19, 2013 · 5122b6d · 5122b6d
1 parent 83e62f9
commit 5122b6d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/include/template.class.php b/include/template.class.php
@@ -750,7 +750,7 @@ function func_combine_css($params)
       $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 @@ function combine()
     return $result;
   }
 
-  private function flush_pending(&$result, $pending, $key, $force)
+  private function flush_pending(&$result, &$pending, $key, $force)
   {
     if (count($pending)>1)
     {