diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2017-08-06 10:11:28 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2017-08-06 10:11:28 -0700 |
| commit | de9d037528895f7151a9aead6724ce2df95f9586 (patch) | |
| tree | 3ba47a923a1d6033605ffc5586ed1af439d8c141 /rt/share/html/Widgets/Form/Select | |
| parent | b226bc6bd81f999176cdbfa53a799033ff0a0307 (diff) | |
rt 4.2.14 (#13852)
Diffstat (limited to 'rt/share/html/Widgets/Form/Select')
| -rw-r--r-- | rt/share/html/Widgets/Form/Select | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rt/share/html/Widgets/Form/Select b/rt/share/html/Widgets/Form/Select index d08cea9ea..e3be527f6 100644 --- a/rt/share/html/Widgets/Form/Select +++ b/rt/share/html/Widgets/Form/Select @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -91,7 +91,7 @@ $Multiple => 0, % foreach my $v( @Values ) { % my $selected = ''; % $selected = 'selected="selected"' if delete $CurrentValue{ $v }; -<option value="<% $v %>" <% $selected |n %>><% loc($ValuesLabel{ $v } || $v) %></option> +<option value="<% $v %>" <% $selected |n %>><% loc(ref($ValuesLabel{ $v }) ? @{ $ValuesLabel{ $v } } : $ValuesLabel{ $v } || $v) %></option> % } % if ( $Alternative ) { @@ -120,7 +120,7 @@ if ( $ValuesCallback ) { } unless (defined $DefaultLabel ) { $DefaultLabel = loc('Use system default ([_1])', - join ', ', map loc($ValuesLabel{$_} || $_), grep defined, + join ', ', map loc(ref($ValuesLabel{$_}) ? @{ $ValuesLabel{$_ }} : $ValuesLabel{$_} || $_), grep defined, @DefaultValue ); } |