From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 18 Dec 2018 13:36:36 +0000 (-0500)
Subject: Merge branch '2018.12-rc' into task/6208-escape-html-true
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=21a055f670149e67f2ad03da43f590c5329822e2;p=friendica.git

Merge branch '2018.12-rc' into task/6208-escape-html-true
---

21a055f670149e67f2ad03da43f590c5329822e2
diff --cc view/theme/frio/templates/contact_edit.tpl
index b0d201af63,462df3cd2e..8d9bd232a9
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@@ -39,16 -39,14 +39,14 @@@
  
  					{{* Block with status information about the contact *}}
  					<ul>
 -						{{if $relation_text}}<li><div id="contact-edit-rel">{{$relation_text|escape}}</div></li>{{/if}}
 -						{{if $nettype}}<li><div id="contact-edit-nettype">{{$nettype|escape}}</div></li>{{/if}}
 +						{{if $relation_text}}<li><div id="contact-edit-rel">{{$relation_text}}</div></li>{{/if}}
 +						{{if $nettype}}<li><div id="contact-edit-nettype">{{$nettype}}</div></li>{{/if}}
  
  						{{if $poll_enabled}}
 -							<li><div id="contact-edit-last-update-text">{{$lastupdtext|escape}} <span id="contact-edit-last-updated">{{$last_update|escape}}</span></div>
 +							<li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
  							{{if $poll_interval}}
- 								<form id="contact-edit-poll-form" action="/contact/{{$contact_id}}" method="post"> 
- 									<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}}
- 									<input class="btn btn-primary" type="submit" name="submit" value="{{$submit}}" />
- 								</form>
 -								<span id="contact-edit-poll-text">{{$updpub|escape}}</span> {{$poll_interval}}
 -								<input class="btn btn-primary" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
++								<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
++								<input class="btn btn-primary" type="submit" name="submit" value="{{$submit" />
  							{{/if}}
  							</li>
  						{{/if}}