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

Prevent an exception in some (rare?) conditions where an incorrect value was set in a temporary object....cf Trac #466

Browse Source 
SVN:trunk[1546]
This commit is contained in:
Denis Flaven
2011-08-31 14:28:41 +00:00
parent a7e937ec58
commit 29f1dd5a69
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/dbobject.class.php
View File

@@ -538,8 +538,16 @@ abstract class DBObject
{
// If the object if not issued from a query but constructed programmatically
// the label may be empty. In this case run a query to get the object's friendly name
$oTmpObj = MetaModel::GetObject($sObjClass, $sObjKey);
$sLabel = $oTmpObj->GetName();
$oTmpObj = MetaModel::GetObject($sObjClass, $sObjKey, false);
if (is_object($oTmpObj))
{
$sLabel = $oTmpObj->GetName();
}
else
{
// May happen in case the target object is not in the list of allowed values for this attribute
$sLabel = "<em>$sObjClass::$sObjKey</em>";
}
//$sLabel = MetaModel::GetName($sObjClass)." #$sObjKey";
}
$sHint = MetaModel::GetName($sObjClass)."::$sObjKey";