From 6f5a7a060866e56d2ea3855dbc8b92241c682934 Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@knowledgetree.com>
Date: Wed, 1 Feb 2006 10:58:13 +0000
Subject: [PATCH] KTS-257: Get the list of available fieldsets more accurately.

---
 plugins/ktcore/admin/documentTypes.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/ktcore/admin/documentTypes.php b/plugins/ktcore/admin/documentTypes.php
index 5187fcc..8f68a9c 100755
--- a/plugins/ktcore/admin/documentTypes.php
+++ b/plugins/ktcore/admin/documentTypes.php
@@ -37,7 +37,7 @@ class KTDocumentTypeDispatcher extends KTAdminDispatcher {
         $oDocumentType =& DocumentType::createFromArray(array(
             'name' => $sName,
         ));
-        
+
         if (PEAR::isError($oDocumentType)) {
             $this->errorRedirectToMain(_('Could not create document type'));
             exit(0);
@@ -102,12 +102,14 @@ class KTDocumentTypeDispatcher extends KTAdminDispatcher {
         
         
         $aCurrentFieldsets =& KTFieldset::getForDocumentType($oDocumentType);
+        $aCurrentFieldsetIds = array_map(array("KTUtil", "getId"), $aCurrentFieldsets);
         $aAvailableFieldsets =& KTFieldset::getNonGenericFieldsets();
-        $aAvailableFieldsets = array_diff($aAvailableFieldsets, $aCurrentFieldsets);
-        
+        $aAvailableFieldsetIds =& array_map(array("KTUtil", "getId"), $aAvailableFieldsets);
+        $aAvailableFieldsetIds = array_diff($aAvailableFieldsetIds, $aCurrentFieldsetIds);
         
         $vocab = array();
-        foreach ($aAvailableFieldsets as $oFieldset) {
+        foreach ($aAvailableFieldsetIds as $iFieldsetId) {
+            $oFieldset = KTFieldset::get($iFieldsetId);
             $vocab[$oFieldset->getId()] = $oFieldset->getName();
         }
         $aOptions = array();
--
libgit2 0.21.4