[Rt-commit] rt branch, 4.0-trunk, updated. rt-3.9.7-1180-ge3f2d7d

[Alex Vandiver]

The branch, 4.0-trunk has been updated
       via  e3f2d7df42aa8395034c5371b2ced69b82f42de1 (commit)
      from  b69e66b857bf1ddefd3c5cc9c26b69bf105da3b8 (commit)

Summary of changes:
 share/html/Elements/SelectOwnerDropdown |    2 +-
 share/html/m/ticket/reply               |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit e3f2d7df42aa8395034c5371b2ced69b82f42de1
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Jan 4 19:38:06 2011 -0500

    Don't escape DefaultLabel, to prevent double escaping on /Ticket/Update.html
    
    SelectOwner is passed the output of ShowUser, which is already
    escaped, and then escapes it again; this can cause double escaping if
    the current users' user display preference is set to verbose.

diff --git a/share/html/Elements/SelectOwnerDropdown b/share/html/Elements/SelectOwnerDropdown
index 5aa5e82..dbfbb16 100755
--- a/share/html/Elements/SelectOwnerDropdown
+++ b/share/html/Elements/SelectOwnerDropdown
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>" id="<%$Name%>">
 %if ($DefaultValue) {
-<option value=""<% !$Default ? qq[ selected="selected"] : '' |n %>><%$DefaultLabel%></option>
+<option value=""<% !$Default ? qq[ selected="selected"] : '' |n %>><%$DefaultLabel |n%></option>
 %}
 % $Default = 0 unless defined $Default && $Default =~ /^\d+$/;
 % my @formatednames = sort {lc $a->[1] cmp lc $b->[1]} map {[$_, $m->scomp('/Elements/ShowUser', User => $_)]} grep { $_->id != RT->Nobody->id } @users;
diff --git a/share/html/m/ticket/reply b/share/html/m/ticket/reply
index e31abae..67856fb 100644
--- a/share/html/m/ticket/reply
+++ b/share/html/m/ticket/reply
@@ -66,7 +66,7 @@
     Name         => "Owner",
     TicketObj    => $t,
     QueueObj     => $t->QueueObj,
-    DefaultLabel => loc("[_1] (Unchanged)", $t->OwnerObj->Name),
+    DefaultLabel => loc("[_1] (Unchanged)", $m->scomp('/Elements/ShowUser', User => $t->OwnerObj)),
     Default      => $ARGS{'Owner'}
 &>
 </div></div>

-----------------------------------------------------------------------