diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2019-03-18 08:55:54 +1100 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2019-03-18 08:55:54 +1100 |
| commit | 97009a27482f4a744eded54132f9067e1a2e6c80 (patch) | |
| tree | f7d56c9b097ea63ef0c09d08ac13805188d4e739 /Zotlabs/Zot6 | |
| parent | a976f418e35a8f4651441a952c8f4c037cb8d2f9 (diff) | |
| parent | e28bde6ccdb03b370df1dbc8654d69c905b8a235 (diff) | |
| download | volse-hubzilla-97009a27482f4a744eded54132f9067e1a2e6c80.tar.gz volse-hubzilla-97009a27482f4a744eded54132f9067e1a2e6c80.tar.bz2 volse-hubzilla-97009a27482f4a744eded54132f9067e1a2e6c80.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
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) ? : [] ); } |