mirror of
https://github.com/mail-in-a-box/mailinabox.git
synced 2025-04-04 00:17:06 +00:00
190d7195d3
The roundcube password plugin is not disabled. # Conflicts: # management/utils.py # setup/start.sh # setup/system.sh # setup/webmail.sh # tools/editconf.py
16 lines
745 B
Diff
16 lines
745 B
Diff
--- a/Net/LDAP2/Entry.php
|
|
+++ b/Net/LDAP2/Entry.php
|
|
@@ -363,10 +363,9 @@ protected function setAttributes($attributes = null)
|
|
$attributes = array();
|
|
do {
|
|
if (empty($attr)) {
|
|
- $ber = null;
|
|
- $attr = @ldap_first_attribute($this->_link, $this->_entry, $ber);
|
|
+ $attr = @ldap_first_attribute($this->_link, $this->_entry);
|
|
} else {
|
|
- $attr = @ldap_next_attribute($this->_link, $this->_entry, $ber);
|
|
+ $attr = @ldap_next_attribute($this->_link, $this->_entry);
|
|
}
|
|
if ($attr) {
|
|
$func = 'ldap_get_values'; // standard function to fetch value
|