diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2021-12-10 16:39:50 +0100 |
|---|---|---|
| committer | Carl Schwan <carl@carlschwan.eu> | 2022-10-20 12:09:06 +0200 |
| commit | 6522f8a6d98f81a10f68cd01294201997d51c3a0 (patch) | |
| tree | d1fb797b9838bd17d19644bffdaed64779024cb3 /apps | |
| parent | 49aa352069f5c4703d01593cb51b2787d2a27aeb (diff) | |
| download | nextcloud-server-6522f8a6d98f81a10f68cd01294201997d51c3a0.tar.gz nextcloud-server-6522f8a6d98f81a10f68cd01294201997d51c3a0.zip | |
Fix merging list with null
This fixes some cases observed with the debugger where we end up merging
a non empty list with null. The result is then null and the looping over
the items would then end.
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/user_ldap/lib/Group_LDAP.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php index 6b50c30ff0a..c2259c42aba 100644 --- a/apps/user_ldap/lib/Group_LDAP.php +++ b/apps/user_ldap/lib/Group_LDAP.php @@ -24,6 +24,7 @@ * @author Victor Dubiniuk <dubiniuk@owncloud.com> * @author Vinicius Cubas Brand <vinicius@eita.org.br> * @author Xuanwo <xuanwo@yunify.com> + * @author Carl Schwan <carl@carlschwan.eu> * * @license AGPL-3.0 * @@ -375,7 +376,7 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I $fetched = $this->access->connection->getFromCache($cacheKey); if ($fetched === null) { $fetched = $fetcher($recordDN); - $fetched = $this->access->connection->writeToCache($cacheKey, $fetched); + $this->access->connection->writeToCache($cacheKey, $fetched); } $list = array_merge($list, $fetched); if (!isset($seen[$recordDN]) || is_bool($seen[$recordDN]) && is_array($record)) { |