mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 14:18:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Lucas Bartholemy 2022-11-08 22:03:26 +01:00
commit a692e460d7
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -9,7 +9,8 @@ HumHub Changelog
- Fix #5875: LDAP user creation broken without email address
- Fix #5877: Fix wrong empty profile stream message
- Fix #5874: Fix adding licence key after removing it from marketplace
- Enh #5891: Improve select2 width on people filters
- Fix #5909: Fix optional parameter on ldap user searching
1.12.1 (August 15, 2022)
------------------------

4
protected/humhub/modules/ldap/components/ZendLdap.php
View File

@ -8,8 +8,6 @@ use Laminas\Ldap\Ldap;
use Laminas\Ldap\Filter;
use Laminas\Ldap\Dn;
use Laminas\Ldap\Exception;
use Laminas\Ldap\Exception\LdapException;
use Traversable;
use Laminas\Ldap\ErrorHandler;
@ -42,7 +40,7 @@ class ZendLdap extends Ldap
* @throws Exception\LdapException
*/
public function multiPageSearch(
$filter, $basedn = null, $scope, array $attributes = array(), $sort = null,
$filter, $basedn, $scope, array $attributes = array(), $sort = null,
$collectionClass = null, $timelimit = 0, $pageSize = 10000
)
{