clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6322 from MrPetovan/bug/6316-unescape-aes-allow 

Unescape aes allow
This commit is contained in:
Tobias Diekershoff 2018-12-25 08:29:12 +01:00 committed by GitHub
parent a8cbeab8a0 c5a3cdcf82
commit ef4ce69e4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/dfrn_request.php
View File

@ -512,8 +512,7 @@ function dfrn_request_content(App $a)
dfrn_request_post($a);
killme();
return; // NOTREACHED
exit();
}
$tpl = Renderer::getMarkupTemplate("dfrn_req_confirm.tpl");
@ -521,7 +520,6 @@ function dfrn_request_content(App $a)
'$dfrn_url' => $dfrn_url,
'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
'$hidethem' => L10n::t('Hide this contact'),
'$hidechecked' => '',
'$confirm_key' => $confirm_key,
'$welcome' => L10n::t('Welcome home %s.', $a->user['username']),
'$please' => L10n::t('Please confirm your introduction/connection request to %s.', $dfrn_url),

4
view/templates/dfrn_req_confirm.tpl
View File

@ -10,10 +10,10 @@
<input type="hidden" name="dfrn_url" value="{{$dfrn_url}}" />
<input type="hidden" name="confirm_key" value="{{$confirm_key}}" />
<input type="hidden" name="localconfirm" value="1" />
{{$aes_allow}}
{{$aes_allow nofilter}}
<label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">{{$hidethem}}</label>
<input type="checkbox" name="hidden-contact" value="1" {{if $hidechecked}}checked="checked" {{/if}} />
<input type="checkbox" name="hidden-contact" value="1" />
<div id="dfrn-request-homecoming-submit-wrapper" >