From 919e930aa9279b3c5cd12b593889cd6de79d67bf Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 12 Jun 2015 15:19:00 -0700
Subject: rt 4.0.23

---
 rt/share/html/Elements/EditCustomFieldWikitext | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rt/share/html/Elements/EditCustomFieldWikitext')

diff --git a/rt/share/html/Elements/EditCustomFieldWikitext b/rt/share/html/Elements/EditCustomFieldWikitext
index d4b79cd38..b75fc99d3 100644
--- a/rt/share/html/Elements/EditCustomFieldWikitext
+++ b/rt/share/html/Elements/EditCustomFieldWikitext
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
-- 
cgit v1.2.1


From 1c538bfabc2cd31f27067505f0c3d1a46cba6ef0 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 9 Jul 2015 22:18:55 -0700
Subject: RT 4.2.11, ticket#13852

---
 rt/share/html/Elements/EditCustomFieldWikitext | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'rt/share/html/Elements/EditCustomFieldWikitext')

diff --git a/rt/share/html/Elements/EditCustomFieldWikitext b/rt/share/html/Elements/EditCustomFieldWikitext
index b75fc99d3..7acad3778 100644
--- a/rt/share/html/Elements/EditCustomFieldWikitext
+++ b/rt/share/html/Elements/EditCustomFieldWikitext
@@ -53,7 +53,7 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$NamePrefix%><%$CustomField->Id%>-Values" class="CF-<%$CustomField->id%>-Edit"><% $value->Content %></textarea><br />
+name="<%$name%>" class="CF-<%$CustomField->id%>-Edit"><% $value->Content %></textarea><br />
 % }
 % if (!$MaxValues or !$Values or $Values->Count < $MaxValues) {
 <textarea \
@@ -63,16 +63,18 @@ cols="<% $Cols %>" \
 % if ( defined $Rows ) {
 rows="<% $Rows %>" \
 % }
-name="<%$NamePrefix%><%$CustomField->Id%>-Values" class="CF-<%$CustomField->id%>-Edit"><% $Default %></textarea>
+name="<%$name%>" class="CF-<%$CustomField->id%>-Edit"><% $Default %></textarea>
 % }
 <%INIT>
 # XXX - MultiValue textarea is for now outlawed.
 $MaxValues = 1;
+my $name = $Name || $NamePrefix . $CustomField->Id . '-Values';
 </%INIT>
 <%ARGS>
 $Object => undef
 $CustomField => undef
 $NamePrefix => undef
+$Name => undef
 $Default => undef
 $Values => undef
 $MaxValues => undef
-- 
cgit v1.2.1