composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Protection against a non existing UserLDAP class (in case the LDAP module is not installed)

Browse Source 
SVN:trunk[3251]
This commit is contained in:
Denis Flaven
2014-07-07 17:02:40 +00:00
parent bb70884041
commit bab6ca7954
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/valuesetdef.class.inc.php
View File

@@ -389,13 +389,27 @@ class ValueSetEnumClasses extends ValueSetEnum
// Translate the labels of the additional values
foreach($this->m_aValues as $sClass => $void)
{
$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
if (MetaModel::IsValidClass($sClass))
{
$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
}
else
{
unset($this->m_aValues[$sClass]);
}
}
// Then, add the classes from the category definition
foreach (MetaModel::GetClasses($this->m_sCategories) as $sClass)
{
$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
if (MetaModel::IsValidClass($sClass))
{
$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
}
else
{
unset($this->m_aValues[$sClass]);
}
}
return true;