yetangitu/lam
1
0
Fork 0
mirror of https://github.com/LDAPAccountManager/lam.git synced 2025-10-05 19:42:31 +02:00
Code Issues Releases Wiki Activity

fixed exception

Browse source
This commit is contained in:
Roland Gruber 2022-09-05 21:07:31 +02:00
parent 8978e9361c
commit 0aeb5d696b
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lam/lib/baseType.inc
View file

@ -104,6 +104,9 @@ class baseType {
$descriptions = array(); $descriptions = array();
foreach ($this->getType()->getModules() as $moduleName) { foreach ($this->getType()->getModules() as $moduleName) {
$module = moduleCache::getModule($moduleName, $this->getScope()); $module = moduleCache::getModule($moduleName, $this->getScope());
if ($module === null) {
continue;
}
$descriptions = array_merge($descriptions, $module->getListAttributeDescriptions($this->getType())); $descriptions = array_merge($descriptions, $module->getListAttributeDescriptions($this->getType()));
} }
return $descriptions; return $descriptions;

5
lam/lib/types.inc
View file

@ -293,7 +293,10 @@ class ConfiguredType {
*/ */
public function getModules() { public function getModules() {
$typeSettings = $this->typeManager->getConfig()->get_typeSettings(); $typeSettings = $this->typeManager->getConfig()->get_typeSettings();
$modules = !empty($typeSettings['modules_' . $this->getId()]) ? $typeSettings['modules_' . $this->getId()] : ''; if (empty($typeSettings['modules_' . $this->getId()])) {
return array();
}
$modules = $typeSettings['modules_' . $this->getId()];
return explode(',', $modules); return explode(',', $modules);
} }