diff options
| author | Mario <mario@mariovavti.com> | 2019-03-15 02:51:51 +0100 |
|---|---|---|
| committer | M. Dent <dentm42@gmail.com> | 2019-03-15 02:51:51 +0100 |
| commit | ebc3666c6f9a14db7efba849c4837d45688f030f (patch) | |
| tree | 29feeb54f4de964f1083349fc4bbbd454cf18f3e /Zotlabs/Zot6 | |
| parent | 8769fa0156c470b533bdf23a0df5beb20bc1a4bd (diff) | |
| download | volse-hubzilla-ebc3666c6f9a14db7efba849c4837d45688f030f.tar.gz volse-hubzilla-ebc3666c6f9a14db7efba849c4837d45688f030f.tar.bz2 volse-hubzilla-ebc3666c6f9a14db7efba849c4837d45688f030f.zip | |
Cleanup and fixes
Diffstat (limited to 'Zotlabs/Zot6')
| -rw-r--r-- | Zotlabs/Zot6/HTTPSig.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Zot6/Zot6Handler.php | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Zot6/HTTPSig.php b/Zotlabs/Zot6/HTTPSig.php index 72785b1e9..d3a09b858 100644 --- a/Zotlabs/Zot6/HTTPSig.php +++ b/Zotlabs/Zot6/HTTPSig.php @@ -5,6 +5,7 @@ namespace Zotlabs\Zot6; use Zotlabs\Lib\ActivityStreams; use Zotlabs\Lib\Webfinger; use Zotlabs\Web\HTTPHeaders; +use Zotlabs\Lib\Libzot; /** * @brief Implements HTTP Signatures per draft-cavage-http-signatures-10. @@ -324,7 +325,7 @@ class HTTPSig { if($l['rel'] === 'http://purl.org/zot/protocol/6.0' && array_key_exists('href',$l) && $l['href'] !== EMPTY_STR) { $z = \Zotlabs\Lib\Zotfinger::exec($l['href']); if($z) { - $i = Zotlabs\Lib\Libzot::import_xchan($z['data']); + $i = Libzot::import_xchan($z['data']); if($i['success']) { $key['portable_id'] = $i['hash']; diff --git a/Zotlabs/Zot6/Zot6Handler.php b/Zotlabs/Zot6/Zot6Handler.php index 8f8957037..37ce11980 100644 --- a/Zotlabs/Zot6/Zot6Handler.php +++ b/Zotlabs/Zot6/Zot6Handler.php @@ -151,8 +151,7 @@ class Zot6Handler implements IHandler { /* * fetch the requested conversation */ - /// @FIXME $sender_hash is undefined - $messages = zot_feed($c[0]['channel_id'],$sender_hash, [ 'message_id' => $data['message_id'], 'encoding' => 'activitystreams' ]); + $messages = zot_feed($c[0]['channel_id'], $sender, [ 'message_id' => $data['message_id'], 'encoding' => 'activitystreams' ]); return (($messages) ? : [] ); } |