Fix wrong merge + nofilter in contact_edit
This commit is contained in:
parent
21a055f670
commit
a01bdbbe2d
3 changed files with 3 additions and 3 deletions
|
@ -32,7 +32,7 @@
|
||||||
{{if $poll_enabled}}
|
{{if $poll_enabled}}
|
||||||
<li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
|
<li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
|
||||||
{{if $poll_interval}}
|
{{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}}
|
{{/if}}
|
||||||
</li>
|
</li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
<li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
|
<li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
|
||||||
{{if $poll_interval}}
|
{{if $poll_interval}}
|
||||||
<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
|
<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}}
|
{{/if}}
|
||||||
</li>
|
</li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
{{if $poll_enabled}}
|
{{if $poll_enabled}}
|
||||||
<li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
|
<li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
|
||||||
{{if $poll_interval}}
|
{{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}}
|
{{/if}}
|
||||||
</li>
|
</li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
Loading…
Reference in a new issue