X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fhtml%2FElements%2FEditCustomFieldSelect;h=5dd4d0d6962c15a367467b862e3ff7a5e6eb03eb;hp=db33a683984123224872301a5f76905c348d7e1d;hb=9c68254528b6f2c7d8c1921b452fa56064783782;hpb=d4d0590bef31071e8809ec046717444b95b3f30a

diff --git a/rt/html/Elements/EditCustomFieldSelect b/rt/html/Elements/EditCustomFieldSelect
index db33a6839..5dd4d0d69 100644
--- a/rt/html/Elements/EditCustomFieldSelect
+++ b/rt/html/Elements/EditCustomFieldSelect
@@ -51,9 +51,10 @@
 % while ($CFVs and my $value = $CFVs->Next ) {
         <option value="<%$value->Name%>" 
 % if ($Values) {
-            <% $Values->HasEntry($value->Name) && ($selected = 1) && 'SELECTED' %>
+            <% ($Values->HasEntry($value->Name)||'') && ($selected = 1) && 'SELECTED' %>
 % } elsif ($Default) {
-            <% ($Default eq $value->Name) && ($selected = 1) && 'SELECTED' %>
+            <% (ref $Default ? (grep {$_ eq $value->Name} @{$Default}) : ($Default eq $value->Name))
+                && ($selected = 1) && 'SELECTED' %>
 % }
             ><% $value->Name%></option>
 % }