[Rt-commit] rt branch, master, updated. rt-4.1.13-283-ga2ce2b0

[Alex Vandiver]

The branch, master has been updated
       via  a2ce2b013b8a57f5a5394b8142f6ea2c61c6f38a (commit)
      from  521a43f73b0d25b02460938d90c201be7e25cc97 (commit)

Summary of changes:
 share/html/Elements/ShowTransaction | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit a2ce2b013b8a57f5a5394b8142f6ea2c61c6f38a
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Jul 9 15:40:37 2013 -0400

    Correctly show merged history as "Ticket #42" not "Ticket #Ticket"

diff --git a/share/html/Elements/ShowTransaction b/share/html/Elements/ShowTransaction
index 7785356..90ae913 100644
--- a/share/html/Elements/ShowTransaction
+++ b/share/html/Elements/ShowTransaction
@@ -126,7 +126,7 @@ if ( $Object->id != $Transaction->ObjectId ) {
     # merged objects
     $desc = join " - ",
         $m->interp->apply_escapes(
-            loc("[_1] #[_1]:", loc($record_type), $Transaction->ObjectId), 'h'),
+            loc("[_1] #[_2]:", loc($record_type), $Transaction->ObjectId), 'h'),
         $desc;
 }
 

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