Merge pull request #10544 from annando/router-lock

[friendica.git] / src / Module / Contact / Poke.php

diff --git a/src/Module/Contact/Poke.php b/src/Module/Contact/Poke.php
index 5ecec4bae09be114344795bce35ddce4f2883226..955d4bab0e7cc2fa465c5bb6e078b8f6498b19ee 100644 (file)
--- a/src/Module/Contact/Poke.php
+++ b/src/Module/Contact/Poke.php
@@ -3,6 +3,7 @@
 namespace Friendica\Module\Contact;
 
 use Friendica\BaseModule;
+use Friendica\Content\Widget;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -10,6 +11,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model;
+use Friendica\Model\Contact;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\Activity;
 use Friendica\Util\XML;
@@ -44,7 +46,7 @@ class Poke extends BaseModule
 
                Logger::info('verb ' . $verb . ' contact ' . $contact_id);
 
-               $contact = DBA::selectFirst('contact', ['id', 'name', 'url'], ['id' => $parameters['id'], 'uid' => local_user()]);
+               $contact = DBA::selectFirst('contact', ['id', 'name', 'url', 'photo'], ['id' => $parameters['id'], 'uid' => local_user()]);
                if (!DBA::isResult($contact)) {
                        return self::postReturn(false);
                }
@@ -58,7 +60,7 @@ class Poke extends BaseModule
                $deny_cid      = ($private ? '' : $a->user['deny_cid']);
                $deny_gid      = ($private ? '' : $a->user['deny_gid']);
 
-               $actor = $a->contact;
+               $actor = Contact::getById($a->getContactId());
 
                $uri = Model\Item::newURI($uid);
 
@@ -135,7 +137,7 @@ class Poke extends BaseModule
                        throw new HTTPException\NotFoundException();
                }
 
-               Model\Profile::load(DI::app(), '', Model\Contact::getByURL($contact["url"], false));
+               DI::page()['aside'] = Widget\VCard::getHTML(Model\Contact::getByURL($contact["url"], false));
 
                $verbs = [];
                foreach (DI::l10n()->getPokeVerbs() as $verb => $translations) {