don't urlencode $_GET vars

2011-01-21 05:21:13 -08:00
parent c574e4c587
commit d347026094
2 changed files with 9 additions and 5 deletions
--- 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'] : '');
 		}

 		/**