index 517ca272dbf01ee832a0877cdf991b573ee10f0e..dae522f0f46ce28e24e30a023c68fe39c10701a3 100644 (file)
$aclCategory = $object;
}
- if($this->config->get_cfg_value("displayerrors") == "true"){
+ if($this->config->get_cfg_value("displayErrors") == "true"){
if(!isset($this->ocMapping[$aclCategory])){
trigger_error("Invalid ACL category '".$aclCategory."'! ({$object})");
return("");
}
/* Global ACL? */
+ if (isset($subacl['acl']['all/all'][0])){
+ $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl']['all/all'][0]);
+ continue;
+ }
+
+ /* Global ACL? - Old style global ACL - Was removed since class_core.inc was created */
if (isset($subacl['acl']['all'][0])){
$acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl']['all'][0]);
continue;
}
}
}else{
- if($this->config->get_cfg_value("displayerrors") == "true"){
+ if($this->config->get_cfg_value("displayErrors") == "true"){
trigger_error("Invalid type of category ".$category);
}
$acl = "";