bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #6359 from MrPetovan/bug/6358-unescape-invite-desc

Browse source 
Unescape $invite_desc in follow/register templates
This commit is contained in:
Michael Vogel 2019-01-01 09:37:40 +01:00 committed by GitHub
parent e7ee3d7200 0dc06d66a0
commit 931971ae64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
view/templates/auto_request.tpl
View file

@ -10,7 +10,7 @@
</ul> </ul>
</p> </p>
<p> <p>
{{$invite_desc}} {{$invite_desc nofilter}}
</p> </p>
<p> <p>
{{$desc nofilter}} {{$desc nofilter}}

2
view/templates/dfrn_request.tpl
View file

@ -9,7 +9,7 @@
<li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li> <li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
<li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li> <li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li>
</ul> </ul>
{{$invite_desc}} {{$invite_desc nofilter}}
</p> </p>
<p> <p>
{{$desc nofilter}} {{$desc nofilter}}

2
view/templates/register.tpl
View file

@ -20,7 +20,7 @@
{{/if}} {{/if}}
{{if $invitations}} {{if $invitations}}
<p id="register-invite-desc">{{$invite_desc}}</p> <p id="register-invite-desc">{{$invite_desc nofilter}}</p>
<div id="register-invite-wrapper" > <div id="register-invite-wrapper" >
<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label> <label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" > <input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >

2
view/theme/frio/templates/auto_request.tpl
View file

@ -11,7 +11,7 @@
</ul> </ul>
</p> </p>
<p> <p>
{{$invite_desc}} {{$invite_desc nofilter}}
</p> </p>
<p> <p>
{{$desc}} {{$desc}}

2
view/theme/frio/templates/dfrn_request.tpl
View file

@ -10,7 +10,7 @@
<li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li> <li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
<li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li> <li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li>
</ul> </ul>
{{$invite_desc}} {{$invite_desc nofilter}}
</p> </p>
<p> <p>
{{$desc}} {{$desc}}

2
view/theme/frio/templates/register.tpl
View file

@ -24,7 +24,7 @@
<div id="register-invite-wrapper" class="form-group"> <div id="register-invite-wrapper" class="form-group">
<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label> <label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" class="form-control" value="{{$invite_id}}"> <input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" class="form-control" value="{{$invite_id}}">
<span class="help-block" id="invite_id_tip">{{$invite_desc}}</span> <span class="help-block" id="invite_id_tip">{{$invite_desc nofilter}}</span>
</div> </div>
<div id="register-name-end" ></div> <div id="register-name-end" ></div>
{{/if}} {{/if}}