diff options
| author | root <root@bawker.net> | 2014-05-10 10:55:50 -0700 |
|---|---|---|
| committer | root <root@bawker.net> | 2014-05-10 10:55:50 -0700 |
| commit | 80796c78f5326c670893476fe8e9024c30ebffcc (patch) | |
| tree | 9be350288804ab8fa46e2ce10043c91e5c97672f /include/zot.php | |
| parent | 711719ce0ce340fbcda7559bf20582e85e4b1e3d (diff) | |
| parent | 481b4c21c9ab6e7e6df8f65ef97135fb5807d7fd (diff) | |
| download | volse-hubzilla-80796c78f5326c670893476fe8e9024c30ebffcc.tar.gz volse-hubzilla-80796c78f5326c670893476fe8e9024c30ebffcc.tar.bz2 volse-hubzilla-80796c78f5326c670893476fe8e9024c30ebffcc.zip | |
Merge branch 'master' of https://github.com/chriswinstead/red
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php index c919b0981..9e69aea96 100644 --- a/include/zot.php +++ b/include/zot.php @@ -171,6 +171,10 @@ function zot_finger($webbie,$channel,$autofallback = true) { return array('success' => false); } + // potential issue here; the xchan_addr points to the primary hub. + // The webbie we were called with may not, so it might not be found + // unless we query for hubloc_addr instead of xchan_addr + $r = q("select xchan.*, hubloc.* from xchan left join hubloc on xchan_hash = hubloc_hash where xchan_addr = '%s' and (hubloc_flags & %d) limit 1", @@ -1453,7 +1457,7 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) { if((x($arr,'obj_type')) && (activity_match($arr['obj_type'],ACTIVITY_OBJ_EVENT))) { require_once('include/event.php'); $ev = bbtoevent($arr['body']); - if(x($ev,'desc') && x($ev,'start')) { + if(x($ev,'description') && x($ev,'start')) { $ev['event_xchan'] = $arr['author_xchan']; $ev['uid'] = $channel['channel_id']; $ev['account'] = $channel['channel_account_id']; |