diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2007-01-24 20:35:17 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2007-01-24 20:35:17 +0000 |
| commit | 1d3f7177fed3efebef7e14223ebca0afecc590a9 (patch) | |
| tree | 8b525d9118e735a5c2dae1fb76fb13d261cda472 /templates | |
| parent | 69dbaf3dc7747ee7008ebe2c2cc85e200a390f10 (diff) | |
| download | languages-1d3f7177fed3efebef7e14223ebca0afecc590a9.tar.gz languages-1d3f7177fed3efebef7e14223ebca0afecc590a9.tar.bz2 languages-1d3f7177fed3efebef7e14223ebca0afecc590a9.zip | |
escape and nl2br strings
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/import_resolve.tpl | 6 |
1 files changed, 3 insertions, 3 deletions
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/> |