Merge pull request #6322 from MrPetovan/bug/6316-unescape-aes-allow
Unescape aes allow
This commit is contained in:
commit
ef4ce69e4d
2 changed files with 3 additions and 5 deletions
|
@ -512,8 +512,7 @@ function dfrn_request_content(App $a)
|
||||||
|
|
||||||
dfrn_request_post($a);
|
dfrn_request_post($a);
|
||||||
|
|
||||||
killme();
|
exit();
|
||||||
return; // NOTREACHED
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$tpl = Renderer::getMarkupTemplate("dfrn_req_confirm.tpl");
|
$tpl = Renderer::getMarkupTemplate("dfrn_req_confirm.tpl");
|
||||||
|
@ -521,7 +520,6 @@ function dfrn_request_content(App $a)
|
||||||
'$dfrn_url' => $dfrn_url,
|
'$dfrn_url' => $dfrn_url,
|
||||||
'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
|
'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
|
||||||
'$hidethem' => L10n::t('Hide this contact'),
|
'$hidethem' => L10n::t('Hide this contact'),
|
||||||
'$hidechecked' => '',
|
|
||||||
'$confirm_key' => $confirm_key,
|
'$confirm_key' => $confirm_key,
|
||||||
'$welcome' => L10n::t('Welcome home %s.', $a->user['username']),
|
'$welcome' => L10n::t('Welcome home %s.', $a->user['username']),
|
||||||
'$please' => L10n::t('Please confirm your introduction/connection request to %s.', $dfrn_url),
|
'$please' => L10n::t('Please confirm your introduction/connection request to %s.', $dfrn_url),
|
||||||
|
|
|
@ -10,10 +10,10 @@
|
||||||
<input type="hidden" name="dfrn_url" value="{{$dfrn_url}}" />
|
<input type="hidden" name="dfrn_url" value="{{$dfrn_url}}" />
|
||||||
<input type="hidden" name="confirm_key" value="{{$confirm_key}}" />
|
<input type="hidden" name="confirm_key" value="{{$confirm_key}}" />
|
||||||
<input type="hidden" name="localconfirm" value="1" />
|
<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>
|
<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" >
|
<div id="dfrn-request-homecoming-submit-wrapper" >
|
||||||
|
|
Loading…
Reference in a new issue