aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Zot6/Zot6Handler.php
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2019-03-18 08:55:54 +1100
committerMike Macgirvin <mike@macgirvin.com>2019-03-18 08:55:54 +1100
commit97009a27482f4a744eded54132f9067e1a2e6c80 (patch)
treef7d56c9b097ea63ef0c09d08ac13805188d4e739 /Zotlabs/Zot6/Zot6Handler.php
parenta976f418e35a8f4651441a952c8f4c037cb8d2f9 (diff)
parente28bde6ccdb03b370df1dbc8654d69c905b8a235 (diff)
downloadvolse-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/Zot6Handler.php')
-rw-r--r--Zotlabs/Zot6/Zot6Handler.php3
1 files changed, 1 insertions, 2 deletions
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) ? : [] );
}