From e78743d309ed16ec8cff69ab85e848f4172437b7 Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Fri, 13 Jun 2014 09:10:17 +0000 Subject: [PATCH] Fixed a regression introduced by #930: a field can depend on a hidden fields, but this has no visible effect. SVN:trunk[3210] --- application/cmdbabstract.class.inc.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 7268a9fc9..fbd7e7799 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -2494,6 +2494,12 @@ EOF // Dependency is resolved, remove it unset($aFields[$sFieldCode][$key]); } + else if (!array_key_exists($sDependency, $aFields)) + { + // The current fields depends on a field not present in the form + // let's ignore it (since it cannot change) + unset($aFields[$sFieldCode][$key]); + } } if (count($aFields[$sFieldCode]) == 0) { @@ -2508,7 +2514,7 @@ EOF if (count($aFields) > 0) { - $sMessage = "Error: Circular dependencies between the fields (or field missing in ZList) !
".print_r($aFields, true)."
"; + $sMessage = "Error: Circular dependencies between the fields!
".print_r($aFields, true)."
"; throw(new Exception($sMessage)); } return $aResult;