Merge pull request #10807 from annando/emoji-media

[friendica.git] / src / Module / Xrd.php

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index aa7e04ebcd8097b7e721889d94c4089feb81fa00..1d4082de1a16eb7223e71405f4b892eb9246b3e5 100644 (file)
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -26,7 +26,6 @@ use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
-use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Protocol\ActivityNamespace;
@@ -197,7 +196,7 @@ class Xrd extends BaseModule
                                [
                                        'rel'  => 'http://webfinger.net/rel/avatar',
                                        'type' => $avatar['type'],
-                                       'href' => Contact::getAvatarUrlForUrl($owner['url'], $owner['uid']),
+                                       'href' => User::getAvatarUrl($owner),
                                ],
                                [
                                        'rel'  => 'http://joindiaspora.com/seed_location',
@@ -253,7 +252,7 @@ class Xrd extends BaseModule
                        '$hcard_url'   => $baseURL . '/hcard/' . $owner['nickname'],
                        '$atom'        => $owner['poll'],
                        '$poco_url'    => $owner['poco'],
-                       '$photo'       => Contact::getAvatarUrlForUrl($owner['url'], $owner['uid']),
+                       '$photo'       => User::getAvatarUrl($owner),
                        '$type'        => $avatar['type'],
                        '$salmon'      => $baseURL . '/salmon/' . $owner['nickname'],
                        '$salmen'      => $baseURL . '/salmon/' . $owner['nickname'] . '/mention',