aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2020-02-10 14:38:28 -0800
committerzotlabs <mike@macgirvin.com>2020-02-10 14:38:28 -0800
commitb767bda4105b141d71b94d4fdd4d6332f775db1a (patch)
tree76f4bf2319d35e60701dbe6c272bf08307906a9b /Zotlabs/Module
parentbe81a40b2b3a0b0c117e2c6571bb38f577859bb8 (diff)
parenta39d436f9f46138db623ee3c9ddef2c501ea8bd2 (diff)
downloadvolse-hubzilla-b767bda4105b141d71b94d4fdd4d6332f775db1a.tar.gz
volse-hubzilla-b767bda4105b141d71b94d4fdd4d6332f775db1a.tar.bz2
volse-hubzilla-b767bda4105b141d71b94d4fdd4d6332f775db1a.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Vote.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Vote.php b/Zotlabs/Module/Vote.php
index 2c31d84dc..e1932da23 100644
--- a/Zotlabs/Module/Vote.php
+++ b/Zotlabs/Module/Vote.php
@@ -86,6 +86,7 @@ class Vote extends Controller {
$item['item_origin'] = true;
$item['parent'] = $fetch[0]['id'];
$item['parent_mid'] = $fetch[0]['mid'];
+ $item['thr_parent'] = $fetch[0]['mid'];
$item['uuid'] = new_uuid();
$item['mid'] = z_root() . '/item/' . $item['uuid'];
$item['verb'] = 'Create';
@@ -96,10 +97,11 @@ class Vote extends Controller {
$item['obj_type'] = 'Note';
$item['author'] = channelx_by_n($channel['channel_id']);
- $item['obj'] = Activity::encode_item($item,true);
+ $item['obj'] = Activity::encode_item($item);
// now reset the placeholders
+ $item['verb'] = ACTIVITY_POST;
$item['obj_type'] = 'Answer';
unset($item['author']);
@@ -107,7 +109,6 @@ class Vote extends Controller {
$x = item_store($item);
-
retain_item($fetch[0]['id']);
if($x['success']) {