From 1d3f7177fed3efebef7e14223ebca0afecc590a9 Mon Sep 17 00:00:00 2001
From: Max Kremmel <xing@synapse.plus.com>
Date: Wed, 24 Jan 2007 20:35:17 +0000
Subject: escape and nl2br strings

---
 templates/import_resolve.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates/import_resolve.tpl')

diff --git a/templates/import_resolve.tpl b/templates/import_resolve.tpl
index a30ba27..e6de574 100644
--- a/templates/import_resolve.tpl
+++ b/templates/import_resolve.tpl
@@ -16,21 +16,21 @@
 					<div class="row">
 						{formlabel label="Master String"}
 						{forminput}
-								{$conflict.master}
+								{$conflict.master|escape|nl2br}
 						{/forminput}
 					</div>
 
 					<div class="row">
 						{formlabel label="Existing"}
 						{forminput}
-							<label><input type="radio" name="conflict[{$lang}][{$sourceHash}]" value="" checked="checked" /> {$conflict.existing}</label>
+							<label><input type="radio" name="conflict[{$lang}][{$sourceHash}]" value="" checked="checked" /> {$conflict.existing|escape|nl2br}</label>
 						{/forminput}
 					</div>
 
 					<div class="row">
 						{formlabel label="Imported"}
 						{forminput}
-							<label><input type="radio" name="conflict[{$lang}][{$sourceHash}]" value="{$conflict.import}" /> {$conflict.import}</label>
+							<label><input type="radio" name="conflict[{$lang}][{$sourceHash}]" value="{$conflict.import}" /> {$conflict.import|escape|nl2br}</label>
 						{/forminput}
 					</div>
 					<br/>
-- 
cgit v1.3