From: cajus Date: Tue, 10 Jun 2008 10:25:19 +0000 (+0000) Subject: Removed workaround for broken PHP setups X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=407e1a6e82733c7eafbe180bd4be9f2b5940f13b;p=gosa.git Removed workaround for broken PHP setups git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11278 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc index 3c52101f9..7ff9cb8ac 100644 --- a/gosa-core/include/class_ldap.inc +++ b/gosa-core/include/class_ldap.inc @@ -1204,11 +1204,7 @@ class LDAP{ } # Get base to look for schema - $sr = @ldap_read ($this->cid, NULL, "objectClass=*", array("subschemaSubentry")); - if(!$sr){ - $sr = @ldap_read ($this->cid, "", "objectClass=*", array("subschemaSubentry")); - } - + $sr = @ldap_read ($this->cid, "", "objectClass=*", array("subschemaSubentry")); $attr = @ldap_get_entries($this->cid,$sr); if (!isset($attr[0]['subschemasubentry'][0])){ return array(); @@ -1268,6 +1264,7 @@ class LDAP{ if(class_available("session")){ session::set("LDAP_CACHE::get_objectclasses",$objectclasses); } + return $objectclasses; }