Merge branch 'omigeot-master'

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 6850f4be4dc3ed349891b68cb5943966d1e83d25..24c466bba5655e9533073ffe5d89d383e7ffb9cb 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -590,8 +590,12 @@ function dfrn_request_content(&$a) {
                                $myaddr = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3 );
                        }
                }
-               else { 
-                       $myaddr = ((x($_GET,'address')) ? urldecode($_GET['address']) : '');
+               elseif(x($_GET,'addr')) {
+                       $myaddr = hex2bin($_GET['addr']);
+               }
+               else {
+                       /* $_GET variables are already urldecoded */ 
+                       $myaddr = ((x($_GET,'address')) ? $_GET['address'] : '');
                }
 
                /**