feature 2963 & feature 2985 : more flexibility for FileCombiner (keep…

… API compatibility) git-svn-id: http://piwigo.org/svn/trunk@25547 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Nov 18, 2013 · 5434357 · 5434357
1 parent 7726147
commit 5434357
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/include/template.class.php b/include/template.class.php
@@ -1366,7 +1366,7 @@ final class FileCombiner
   private $is_css;
   private $combinables;
 
-  function FileCombiner($type, $combinables)
+  function FileCombiner($type, $combinables=array())
   {
     $this->type = $type;
     $this->is_css = $type=='css';
@@ -1386,8 +1386,15 @@ static function clear_combined_files()
 
   function add($combinables)
   {
-    foreach($combinables as $combinable)
-      $this->combinables[] = $combinable;
+    if ($combinables instanceof Combinable)
+    {
+      $this->combinables[] = $combinables;
+    }
+    else
+    {
+      foreach($combinables as $combinable)
+        $this->combinables[] = $combinable;
+    }
   }
 
   function combine()