Skip to content
This repository was archived by the owner on Sep 19, 2022. It is now read-only.

Commit b6fe47e

Browse files
Merge pull request #105 from vyskocilpavel/adapterlpda_groups
Fixed problem with getting group without description from LDAP
2 parents 411020d + 167ca19 commit b6fe47e

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
All notable changes to this project will be documented in this file.
33

44
## [Unreleased]
5+
- Fixed problem with getting group without description from LDAP
6+
* Before: Exeption
7+
* Now: Description is ''
8+
59
#### Changed
610
- Releasing forwardedEduPersonEntitlement is now optional (forwardedEduPersonEntitlement are released by default)
711

lib/AdapterLdap.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public function getMemberGroups($user, $vo)
114114
$group['perunVoId'][0],
115115
$group['cn'][0],
116116
$group['perunUniqueGroupName'][0],
117-
$group['description'][0]
117+
$group['description'][0] ?? ''
118118
)
119119
);
120120
}
@@ -154,7 +154,7 @@ public function getSpGroups($spEntityId)
154154
$group['perunVoId'][0],
155155
$group['cn'],
156156
$group['perunUniqueGroupName'][0],
157-
$group['description'][0]
157+
$group['description'][0] ?? ''
158158
)
159159
);
160160
}
@@ -183,7 +183,7 @@ public function getGroupByName($vo, $name)
183183
$group['perunVoId'][0],
184184
$group['cn'][0],
185185
$group['perunUniqueGroupName'][0],
186-
$group['description'][0]
186+
$group['description'][0] ?? ''
187187
);
188188
}
189189

@@ -352,7 +352,7 @@ public function getUsersGroupsOnFacility($spEntityId, $userId)
352352
$group['perunVoId'][0],
353353
$group['cn'][0],
354354
$group['perunUniqueGroupName'][0],
355-
$group['description'][0]
355+
$group['description'][0] ?? ''
356356
)
357357
);
358358
}

0 commit comments

Comments
 (0)