Issue 8233: Fix remote subscriptions

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index bf1fbe3c90430206c91afc4aa4f411555565c131..62a81022fb1dbf2d978ecea771c49c7c5e5469bc 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -455,15 +455,9 @@ function dfrn_request_post(App $a)
                        // Diaspora needs the uri in the format user@domain.tld
                        // Diaspora will support the remote subscription in a future version
                        if ($network == Protocol::DIASPORA) {
-                               $uri = $nickname . '@' . DI::baseUrl()->getHostname();
-
-                               if (DI::baseUrl()->getUrlPath()) {
-                                       $uri .= '/' . DI::baseUrl()->getUrlPath();
-                               }
-
-                               $uri = urlencode($uri);
+                               $uri = urlencode($a->profile['addr']);
                        } else {
-                               $uri = 'profile/' . $nickname;
+                               $uri = urlencode($a->profile['url']);
                        }
 
                        $url = str_replace('{uri}', $uri, $url);