Index: trunk/admin/category/addcategory_custom.php
===================================================================
diff -u -N -r701 -r777
--- trunk/admin/category/addcategory_custom.php	(.../addcategory_custom.php)	(revision 701)
+++ trunk/admin/category/addcategory_custom.php	(.../addcategory_custom.php)	(revision 777)
@@ -183,12 +183,18 @@
       $field =& $objCustomFields->GetItemRefByIndex($i);     
       $fieldid = $field->Get("CustomFieldId");
 
+		$CF=$field->GetAdminUI();
+		if(is_object($cfield = $objCustomFields->GetItemByField("FieldName",substr($CF->name,1),FALSE)))
+			if(is_object($cv=$objCustomDataList->GetDataItem($cfield->Get("CustomFieldId"))))
+				$CF->default_value = $cv->Get("Value");
+
       $f = $objCustomDataList->GetDataItem($fieldid);
       $fieldname = "CustomData[$fieldid]";
+
       if(is_object($f))
       {
-	$val_field = "<input type=\"text\" tabindex=\"".($i+1)."\" VALUE=\"".inp_htmlize($f->Get("Value"))."\" name=\"$fieldname\">";
-        $field->Set("Value", $val_field);
+//		$val_field = "<input type=\"text\" tabindex=\"".($i+1)."\" VALUE=\"".inp_htmlize($f->Get("Value"))."\" name=\"$fieldname\">";
+        $field->Set("Value", $CF->ItemFormElement());
         if ($field->Get('Prompt') != '') {
         	$field->Set("FieldLabel", admin_language($field->Get('Prompt')));
         }
@@ -200,7 +206,7 @@
       else
       {      
         $val_field = "<input type=text tabindex=\"".($i+1)."\" VALUE=\"\" name=\"$fieldname\">";
-        $field->Set("Value", $val_field);
+        $field->Set("Value", $CF->ItemFormElement());
         if ($field->Get('Prompt') != '') {
         	$field->Set("FieldLabel", admin_language($field->Get('Prompt')));
         }
@@ -246,11 +252,13 @@
   <input type="hidden" name="ItemId" value="<?php echo $c->Get("ResourceId"); ?>">
   <input type="hidden" name="Action" value="m_edit_custom_data">
   <input type="hidden" name="CatEditStatus" VALUE="0">
+  <input type="hidden" name="CustomType" VALUE="1">
 </FORM>
 
 
 <FORM id="save_edit" method="POST" NAME="save_edit" ID="save_edit">
    <input type="hidden" name="CatEditStatus" VALUE="0">
+  <input type="hidden" name="CustomType" VALUE="1">
 </FORM>
 <!-- CODE FOR VIEW MENU -->
 <form ID="viewmenu" method="post" action="<?php echo $_SERVER["PHP_SELF"]."?".$envar; ?>" name="viewmenu">