From fc98e5e00795b90344ce7da6a7df60c6d15948ce Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@knowledgetree.com>
Date: Mon, 10 Oct 2005 09:18:26 +0000
Subject: [PATCH] Don't try build free/parent lists if the master field isn't set yet.

---
 presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php
index 095f458..587af28 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php
@@ -231,20 +231,22 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher {
         foreach ($aFields as $oField) {
             $aFreeFieldIds[] = $oField->getId();
         }
-        $aParentFieldIds = array($oMasterField->getId());
-        foreach ($aFieldOrders as $aRow) {
-            $aParentFieldIds[] = $aRow['child_field_id'];
-        }
-        $aParentFields = array();
-        foreach (array_unique($aParentFieldIds) as $iId) {
-            $aParentFields[] =& DocumentField::get($iId);
-        }
-        $aFreeFields = array();
-        foreach ($aFreeFieldIds as $iId) {
-            if (in_array($iId, $aParentFieldIds)) {
-                continue;
+        if ($oMasterField) {
+            $aParentFieldIds = array($oMasterField->getId());
+            foreach ($aFieldOrders as $aRow) {
+                $aParentFieldIds[] = $aRow['child_field_id'];
+            }
+            $aParentFields = array();
+            foreach (array_unique($aParentFieldIds) as $iId) {
+                $aParentFields[] =& DocumentField::get($iId);
+            }
+            $aFreeFields = array();
+            foreach ($aFreeFieldIds as $iId) {
+                if (in_array($iId, $aParentFieldIds)) {
+                    continue;
+                }
+                $aFreeFields[] =& DocumentField::get($iId);
             }
-            $aFreeFields[] =& DocumentField::get($iId);
         }
         $oTemplate->setData(array(
             'oFieldset' => $oFieldset,
--
libgit2 0.21.4