SF Bug #3136564 - Undefined variable: result (E_NOTICE)

This commit is contained in:
Deon George 2011-04-26 11:40:35 +10:00
parent aa8a353c38
commit be623ce3f5
2 changed files with 3 additions and 2 deletions

View File

@ -63,7 +63,7 @@ function pla_rdelete($server,$dn) {
} else {
system_message(array(
'title'=>_('Could not delete the entry.').sprintf(' (%s)',pretty_print_dn($request['dn'])),
'title'=>_('Could not delete the entry.').sprintf(' (%s)',pretty_print_dn($dn)),
'body'=>ldap_error_msg($server->getErrorMessage(null),$server->getErrorNum(null)),
'type'=>'error'));
}
@ -80,7 +80,7 @@ function pla_rdelete($server,$dn) {
} else {
system_message(array(
'title'=>_('Could not delete the entry.').sprintf(' (%s)',pretty_print_dn($request['dn'])),
'title'=>_('Could not delete the entry.').sprintf(' (%s)',pretty_print_dn($dn)),
'body'=>ldap_error_msg($server->getErrorMessage(null),$server->getErrorNum(null)),
'type'=>'error'));
}

View File

@ -477,6 +477,7 @@ class ldap extends DS {
$this->getLoginClass() ? sprintf('(objectclass=%s)',join(')(objectclass=',$this->getLoginClass())) : '');
$query['attrs'] = array('dn');
$result = array();
foreach ($this->getLoginBaseDN() as $base) {
$query['base'] = $base;
$result = $this->query($query,$method);