Merge pull request #7883 from MrPetovan/bug/acl-fixes

[friendica.git] / view / templates / intros.tpl

diff --git a/view/templates/intros.tpl b/view/templates/intros.tpl
index 2d0bf9bd06d46dd58f4b8e1b140944f1adb68088..1f7f838bcfda95830c46694b4e55d5f25facf035 100644 (file)
--- a/view/templates/intros.tpl
+++ b/view/templates/intros.tpl
@@ -3,31 +3,30 @@
 <div class="intro-wrapper" id="intro-{{$contact_id}}" >
 
 <p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
-<img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname|escape:'html'}}" alt="{{$fullname|escape:'html'}}" />
+<img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname}}" alt="{{$fullname}}" />
 <dl><dt>{{$lbl_url}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>
 {{if $location}}<dl><dt>{{$lbl_location}}</dt><dd>{{$location}}</dd></dl>{{/if}}
 {{if $gender}}<dl><dt>{{$lbl_gender}}</dt><dd>{{$gender}}</dd></dl>{{/if}}
 {{if $keywords}}<dl><dt>{{$lbl_keywords}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
-{{if $about}}<dl><dt>{{$lbl_about}}</dt><dd>{{$about}}</dd></dl>{{/if}}
+{{if $about}}<dl><dt>{{$lbl_about}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
 <div class="intro-knowyou">{{$lbl_knowyou}} {{$knowyou}}</div>
 <div class="intro-note" id="intro-note-{{$contact_id}}">{{$note}}</div>
 <div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div>
 <form class="intro-form" action="notifications/{{$intro_id}}" method="post">
-<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore|escape:'html'}}" />
-{{if $discard}}<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard|escape:'html'}}" />{{/if}}
+<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
+{{if $discard}}<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />{{/if}}
 </form>
 <div class="intro-form-end"></div>
 
-<form class="intro-approve-form" action="dfrn_confirm" method="post">
+<form class="intro-approve-form" action="{{$action}}" method="post">
 {{include file="field_checkbox.tpl" field=$hidden}}
-{{include file="field_checkbox.tpl" field=$activity}}
 <input type="hidden" name="dfrn_id" value="{{$dfrn_id}}" >
 <input type="hidden" name="intro_id" value="{{$intro_id}}" >
 <input type="hidden" name="contact_id" value="{{$contact_id}}" >
 
-{{$dfrn_text}}
+{{$dfrn_text nofilter}}
 
-<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve|escape:'html'}}" />
+<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
 </form>
 </div>
 <div class="intro-end"></div>