Index: trunk/admin/category/addcategory.php
===================================================================
diff -u -r3282 -r4077
--- trunk/admin/category/addcategory.php	(.../addcategory.php)	(revision 3282)
+++ trunk/admin/category/addcategory.php	(.../addcategory.php)	(revision 4077)
@@ -24,6 +24,7 @@
 $objEditItems = new clsCatList();
 $objEditItems->SourceTable = $objSession->GetEditTable("Category");
 $objCustomFields = new clsCustomFieldList(1);
+$application->SetVar('c_mode', 't');
 $objCustomDataList = new clsCustomDataList();
 $objRelList = new clsRelationshipList();
 $objImages = new clsImageList();
@@ -42,7 +43,7 @@
     $action = "m_add_category";
     $objCatList->CreateEmptyEditTable("CategoryId");
     $objRelList->CreateEmptyEditTable("RelationshipId");    
-    $objCustomDataList->CreateEmptyEditTable("CustomDataId");
+    $objCustomDataList->CreateEmptyEditTable('c');
     $objImages->CreateEmptyEditTable("ResourceId");
     
     $TitleVerb = prompt_language("la_Text_Adding");
@@ -57,7 +58,7 @@
         /* make a copy of the relationship records */
         $ids = $objEditItems->GetResourceIDList();
         $objRelList->CopyToEditTable("SourceId", $ids);
-        $objCustomDataList->CopyToEditTable("ResourceId",$ids);
+        $objCustomDataList->CopyToEditTable('c', $ids);
         $objImages->CopyToEditTable("ResourceId", $ids);
         $c = $objEditItems->GetItemByIndex(0);
         $itemcount=$objEditItems->NumItems();
@@ -157,7 +158,16 @@
   <tr <?php int_table_color(); ?>>
     <td valign="top"><span class="text"><?php echo prompt_language("la_prompt_CategoryId"); ?></span></td>
     <td valign="top"><span class="text"><?php echo $c->Get("CategoryId"); ?></span></td>
-    <td><span class="text">&nbsp;</span></td>
+    <td class="text">
+    	<?php
+    		if (IsDebugMode()) {
+    			echo '<b>DBG:</b> ResourceId = '.$c->Get('ResourceId');
+    		}
+    		else {
+    			echo '&nbsp;';
+    		}
+    	?>
+    </td>
   </tr>
   <?php } ?>
   <tr <?php int_table_color(); ?>>
@@ -276,13 +286,8 @@
         	$n = substr($f->name,1);
 
         	$cfield = $objCustomFields->GetItemByField("FieldName",$n,FALSE);
-        	if(is_object($cfield))
-        	{
-        		$cv = $objCustomDataList->GetDataItem($cfield->Get("CustomFieldId"));
-        		if(is_object($cv))
-        		{
-        	      $f->default_value = $cv->Get("Value");
-        		}
+        	if (is_object($cfield)) {
+				$f->default_value = $c->GetCustomFieldValue($n, '', 0, true);
         	}
             print "<tr ".int_table_color_ret().">\n"; 
             print "  <td valign=\"top\" class=\"text\">".$f->GetPrompt()."</td>\n";