[mb-commits] r12613 - mb_server/trunk/root/label

[root at musicbrainz.org]

Author: acid2
Date: 2010-01-22 22:58:18 +0000 (Fri, 22 Jan 2010)
New Revision: 12613

Modified:
   mb_server/trunk/root/label/merge_confirm.tt
Log:
Correctly display old/new label in merge confirmation step.

Fixes MBS-271

Modified: mb_server/trunk/root/label/merge_confirm.tt
===================================================================
--- mb_server/trunk/root/label/merge_confirm.tt	2010-01-22 22:58:09 UTC (rev 12612)
+++ mb_server/trunk/root/label/merge_confirm.tt	2010-01-22 22:58:18 UTC (rev 12613)
@@ -1,7 +1,7 @@
 [% WRAPPER 'label/layout.tt' title=l('Merge Labels') %]
     <h2>[% l('Merge Labels') %]</h2>
     [% WRAPPER 'layout/guidelines.tt' %]
-        [%- create_guideline(l('Are you sure that you want to merge the label {label1} into the label {label2}?', {label1 => link_label(old_label), label2 => link_label(new_label)})) -%]
+        [%- create_guideline(l('Are you sure that you want to merge the label {label1} into the label {label2}?', {label1 => link_label(old), label2 => link_label(new)})) -%]
     [%- END -%]
     <form action="[% c.req.uri_with( gid => new_label.gid ) %]" method="post">
         [% INCLUDE "forms/edit-note.tt" %]