Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -r1201 -r1346
--- trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 1201)
+++ trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 1346)
@@ -322,9 +322,10 @@
             	if(method_exists($this,"GetCustomFieldValue"))
             	{
                   $field =  $element->attributes["_customfield"];
+                  $listvalue =  $element->attributes["_listvalue"];
                   $default = $element->attributes["_default"];
                   if (strlen($field))
-                  	$ret = $this->GetCustomFieldValue($field,$default);
+                  	$ret = $this->GetCustomFieldValue($field, $default, $listvalue);
             	}
             break;            
             case "image":
Index: trunk/kernel/include/customfield.php
===================================================================
diff -u -r979 -r1346
--- trunk/kernel/include/customfield.php	(.../customfield.php)	(revision 979)
+++ trunk/kernel/include/customfield.php	(.../customfield.php)	(revision 1346)
@@ -82,7 +82,7 @@
     function LoadFields()
     {
         $this->Clear();
-        $sql = "SELECT * FROM ".$this->SourceTable." WHERE Type=".$this->Type;
+        $sql = "SELECT * FROM ".$this->SourceTable." WHERE Type=".$this->Type." ORDER BY DisplayOrder DESC, CustomFieldId ASC";
         if($this->debuglevel > 1) 
         	echo $sql."<br>\n";
         $rs = $this->adodbConnection->Execute($sql);