diff options
| author | zotlabs <mike@macgirvin.com> | 2020-02-09 16:32:18 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2020-02-09 16:32:18 -0800 |
| commit | bbcb237f5b996e94af37611152105b2e965ea493 (patch) | |
| tree | 042ea69cfc8eb90f0588b9c71edb8e4ef164390b /Zotlabs/Lib/Libzot.php | |
| parent | fc9e6d289acf30f89da0051a90cbf16f0bc006fb (diff) | |
| download | volse-hubzilla-bbcb237f5b996e94af37611152105b2e965ea493.tar.gz volse-hubzilla-bbcb237f5b996e94af37611152105b2e965ea493.tar.bz2 volse-hubzilla-bbcb237f5b996e94af37611152105b2e965ea493.zip | |
poll updates
Diffstat (limited to 'Zotlabs/Lib/Libzot.php')
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index bb70dfbf2..2776a681e 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -1613,7 +1613,7 @@ class Libzot { // As a side effect we will also do a preliminary check that we have the top-level-post, otherwise // processing it is pointless. - $r = q("select route, id, owner_xchan, item_private from item where mid = '%s' and uid = %d limit 1", + $r = q("select route, id, parent_mid, mid, owner_xchan, item_private, obj_type from item where mid = '%s' and uid = %d limit 1", dbesc($arr['parent_mid']), intval($channel['channel_id']) ); @@ -1639,6 +1639,16 @@ class Libzot { continue; } + if ($r[0]['obj_type'] === 'Question') { + // route checking doesn't work correctly here because we've changed the privacy + $r[0]['route'] = EMPTY_STR; + // If this is a poll response, convert the obj_type to our (internal-only) "Answer" type + if ($arr['obj_type'] === ACTIVITY_OBJ_NOTE && $arr['title'] && (! $arr['content'])) { + $arr['obj_type'] = 'Answer'; + } + } + + if($relay || $friendofriend || (intval($r[0]['item_private']) === 0 && intval($arr['item_private']) === 0)) { // reset the route in case it travelled a great distance upstream // use our parent's route so when we go back downstream we'll match |