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());
}
} else if (array_key_exists($subid, $this->suboptions)) {
return $this->suboptions[$subid];
} else {
- return false;
+ return array();
}
}
// {{{ class DE_Networking
class DE_Networking extends DirEnumeration
{
- protected $idfield = 'profile_networking_enum.network_type';
+ protected $idfield = 'profile_networking_enum.nwid';
protected $valfield = 'profile_networking_enum.name';
protected $from = 'profile_networking_enum';
- protected $ac_join = 'INNER JOIN profile_networking ON (profile_networking.network_type = profile_networking_enum.network_type)';
+ protected $ac_join = 'INNER JOIN profile_networking ON (profile_networking.nwid = profile_networking_enum.nwid)';
protected $ac_unique = 'profile_networking.pid';
}
// }}}