From a01bdbbe2d8000768c5496d2de660e87dca1ec32 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 18 Dec 2018 08:39:26 -0500
Subject: [PATCH] Fix wrong merge + nofilter in contact_edit

---
 view/templates/contact_edit.tpl            | 2 +-
 view/theme/frio/templates/contact_edit.tpl | 2 +-
 view/theme/vier/templates/contact_edit.tpl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index c86add3273..08570ec496 100644
--- 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 8d9bd232a9..fd5f1c0f1c 100644
--- 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 7e53caedc6..2f52f82f81 100644
--- 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}}