X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=classes%2Fdirenum.php;h=90fb331962f346cd7190ccb995bbe3b2816214e7;hb=b6dcc0b3f53ce1252bcce82b49ffaf591ec59947;hp=a8b9a8ea5f485c13d8c5553fa2d9e296587c1424;hpb=b270577e919c58455a3629a4d9d61bd38ea49e11;p=platal.git diff --git a/classes/direnum.php b/classes/direnum.php index a8b9a8e..90fb331 100644 --- a/classes/direnum.php +++ b/classes/direnum.php @@ -94,8 +94,10 @@ class DirEnum self::init($type); } $obj = self::$enumerations[$type]; + $args = func_get_args(); + array_shift($args); if ($obj->capabilities & DirEnumeration::HAS_OPTIONS) { - return call_user_func(array($obj, 'getOptionsIter')); + return call_user_func_array(array($obj, 'getOptionsIter'), $args); } else { return PlIteratorUtils::fromArray(array()); } @@ -344,7 +346,7 @@ abstract class DE_WithSuboption extends DirEnumeration } else if (array_key_exists($subid, $this->suboptions)) { return $this->suboptions[$subid]; } else { - return false; + return array(); } }