Changeset 25547

Timestamp:

Nov 18, 2013, 9:53:24 AM (10 years ago)

Author:

mistic100

Message:

feature 2963 & feature 2985 : more flexibility for FileCombiner (keep API compatibility)

File:

• trunk/include/template.class.php (modified) (2 diffs)

trunk/include/template.class.php

@@ -1367 +1367 @@
   private $combinables;
 
-  function FileCombiner($type, $combinables)
+  function FileCombiner($type, $combinables=array())
   {
     $this->type = $type;
@@ -1387 +1387 @@
   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;
+    }
   }