From db477aa4d3abc5ce5f6e1ae9626a65ddb1b3ea2b Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@knowledgetree.com>
Date: Sun, 19 Feb 2006 13:54:32 +0000
Subject: [PATCH] Deal with cases where there is no master field set on a conditional fieldset.

---
 lib/metadata/metadatautil.inc.php | 6 ++++++
 1 file changed, 6 insertions(+), 0 deletions(-)

diff --git a/lib/metadata/metadatautil.inc.php b/lib/metadata/metadatautil.inc.php
index 7319692..0de1210 100644
--- a/lib/metadata/metadatautil.inc.php
+++ b/lib/metadata/metadatautil.inc.php
@@ -131,10 +131,16 @@ class KTMetadataUtil {
 
         if (empty($aCurrentSelections)) {
             $oField =& DocumentField::get($oFieldset->getMasterFieldId());
+            if (PEAR::isError($oField)) {
+                return array();
+            }
             return array($oField->getId() => array('field' => $oField, 'values' => $oField->getValues()));
         }
 
         $oMasterField =& DocumentField::get($oFieldset->getMasterFieldId());
+        if (PEAR::isError($oMasterField)) {
+            return array();
+        }
         $aSelectedFields = array_keys($aCurrentSelections);
         
         $field = $oMasterField->getId();
--
libgit2 0.21.4