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

Unescape aes allow

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 16a2da55607cca309f96959d8134ceefa1658e29..0e24accc013855f307e70b8c5ddcf1249ad58aa7 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -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),

diff --git a/view/templates/dfrn_req_confirm.tpl b/view/templates/dfrn_req_confirm.tpl
index accfd4f83f162bcf5054a3bd1c73d3fd64351e49..693f8cbf92d13bb74099122e6f07c115f67cd3fa 100644 (file)
--- a/view/templates/dfrn_req_confirm.tpl
+++ b/view/templates/dfrn_req_confirm.tpl
@@ -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" >