external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-12 17:07:23 +01:00
Code Issues Releases Wiki Activity

Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox

Browse Source 
The roundcube password plugin is not disabled.

# Conflicts:
#	management/utils.py
#	setup/start.sh
#	setup/system.sh
#	setup/webmail.sh
#	tools/editconf.py
This commit is contained in:
downtownallday
2023-01-15 20:35:08 -05:00
parent aaff2eebcf 61d1ea1ea7
commit 190d7195d3
25 changed files with 231 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
conf/roundcubemail/pear_net_ldap2.1cacdebcf6fe82718e5fa701c1ff688405e0f5d9.diff Normal file
View File

@@ -0,0 +1,15 @@
--- 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