aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Subthread.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-03 11:04:16 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-03 11:04:16 +0200
commit25aded6b9b137a32d9f9ea68baf3e2102fb293e7 (patch)
treee448899f37eb48e6ee2a5ffdb4fd55bf5e9a779b /Zotlabs/Module/Subthread.php
parentb4eb9f2a1142cf121dd41ea0ad81475d38343308 (diff)
parent8d6c2b5d4a799d87df1cd9f6f258890045ce6c62 (diff)
downloadvolse-hubzilla-25aded6b9b137a32d9f9ea68baf3e2102fb293e7.tar.gz
volse-hubzilla-25aded6b9b137a32d9f9ea68baf3e2102fb293e7.tar.bz2
volse-hubzilla-25aded6b9b137a32d9f9ea68baf3e2102fb293e7.zip
Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32
Diffstat (limited to 'Zotlabs/Module/Subthread.php')
-rw-r--r--Zotlabs/Module/Subthread.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Subthread.php b/Zotlabs/Module/Subthread.php
index 16a011a40..0226664d7 100644
--- a/Zotlabs/Module/Subthread.php
+++ b/Zotlabs/Module/Subthread.php
@@ -144,7 +144,7 @@ class Subthread extends \Zotlabs\Web\Controller {
$arr['verb'] = $activity;
$arr['obj_type'] = $objtype;
- $arr['object'] = $obj;
+ $arr['obj'] = $obj;
$arr['allow_cid'] = $item['allow_cid'];
$arr['allow_gid'] = $item['allow_gid'];