Merge branch 'dev' into 'dev'

poll updates

See merge request hubzilla/core!1828

1 files changed, 14 insertions, 4 deletions

diff --git a/Zotlabs/Module/Vote.php b/Zotlabs/Module/Vote.php
index 52d6a4bea..2c31d84dc 100644
--- a/Zotlabs/Module/Vote.php
+++ b/Zotlabs/Module/Vote.php
@@ -88,15 +88,25 @@ class Vote extends Controller {
 			$item['parent_mid'] = $fetch[0]['mid'];
 			$item['uuid'] = new_uuid();
 			$item['mid'] = z_root() . '/item/' . $item['uuid'];
-			$item['verb'] = 'Answer';
+			$item['verb'] = 'Create';
 			$item['title'] = $res;
 			$item['author_xchan'] = $channel['channel_hash'];
 			$item['owner_xchan'] = $fetch[0]['author_xchan'];
 			
-			$item['obj'] = $obj;
-			$item['obj_type'] = 'Question';
+			$item['obj_type'] = 'Note';
+			$item['author'] = channelx_by_n($channel['channel_id']);
+
+			$item['obj'] = Activity::encode_item($item,true);
+
+			// now reset the placeholders
+
+			$item['obj_type'] = 'Answer';
+			unset($item['author']);
+
+
+			$x = item_store($item);
+
 
-			$x = item_store($item); 
 
 			retain_item($fetch[0]['id']);