Fix wrong merge + nofilter in contact_edit

diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index c86add3273de2d6dd1269593c5dec46fcd853b40..08570ec496bc1fb868f38cceaed710acd2b9b66e 100644 (file)
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -32,7 +32,7 @@
                                                {{if $poll_enabled}}
                                                        <li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
                                                        {{if $poll_interval}}
-                                                               <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}}
+                                                               <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
                                                        {{/if}}
                                                        </li>
                                                {{/if}}

diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl
index 8d9bd232a9527a8d478bb73a215b7da69a1866d7..fd5f1c0f1c1b41bc76965b416c9ed52a4b8883ac 100644 (file)
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -46,7 +46,7 @@
                                                        <li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
                                                        {{if $poll_interval}}
                                                                <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
-                                                               <input class="btn btn-primary" type="submit" name="submit" value="{{$submit" />
+                                                               <input class="btn btn-primary" type="submit" name="submit" value="{{$submit}}" />
                                                        {{/if}}
                                                        </li>
                                                {{/if}}

diff --git a/view/theme/vier/templates/contact_edit.tpl b/view/theme/vier/templates/contact_edit.tpl
index 7e53caedc697c0a7cd16b96be2aa56a1a1f3c282..2f52f82f81cfb3e6473b0dab85296053ba9a54cc 100644 (file)
--- a/view/theme/vier/templates/contact_edit.tpl
+++ b/view/theme/vier/templates/contact_edit.tpl
@@ -33,7 +33,7 @@
                                                {{if $poll_enabled}}
                                                        <li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
                                                        {{if $poll_interval}}
-                                                               <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}}
+                                                               <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
                                                        {{/if}}
                                                        </li>
                                                {{/if}}