From fcc5342775ea3dd58889e24dfb1c5f7a1dd0506e Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Fri, 24 Feb 2017 14:09:44 +0000
Subject: [PATCH] Bug fix: protect against a non existing Contact class (a
 rather drastic iTop customization!)

SVN:trunk[4559]
---
 application/forms.class.inc.php | 8 ++++++--
 core/userrights.class.inc.php   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/forms.class.inc.php b/application/forms.class.inc.php
index 00c602145..f16c1af6e 100644
--- a/application/forms.class.inc.php
+++ b/application/forms.class.inc.php
@@ -1438,8 +1438,12 @@ class RunTimeIconSelectionField extends DesignerIconSelectionField
 
 	public function GetDefaultValue($sClass = 'Contact')
 	{
-		$sIconPath = MetaModel::GetClassIcon($sClass, false);
-		$sIcon = str_replace(utils::GetAbsoluteUrlModulesRoot(), '', $sIconPath);
+		$sIcon = '';
+		if (MetaModel::IsValidClass($sClass))
+		{
+			$sIconPath = MetaModel::GetClassIcon($sClass, false);
+			$sIcon = str_replace(utils::GetAbsoluteUrlModulesRoot(), '', $sIconPath);
+		}
 		return $sIcon;	
 	}
 }
diff --git a/core/userrights.class.inc.php b/core/userrights.class.inc.php
index 8c392c205..704d75fb7 100644
--- a/core/userrights.class.inc.php
+++ b/core/userrights.class.inc.php
@@ -245,7 +245,7 @@ abstract class User extends cmdbAbstractObject
 	{
 		if (is_null($this->oContactObject))
 		{
-			if ($this->Get('contactid') != 0)
+			if (MetaModel::IsValidAttCode(get_class($this), 'contactid') && ($this->Get('contactid') != 0))
 			{
 				$this->oContactObject = MetaModel::GetObject('Contact', $this->Get('contactid'));
 			}