aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Subthread.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-02 11:02:15 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-02 11:02:15 +0200
commitf23bdde464ef20ad2ffcb3984cc9481955374809 (patch)
tree5f1d46f3f513ecf2d788b842c0dd01cbd9ac1a99 /Zotlabs/Module/Subthread.php
parentc1039977f1d64611d2c793f3aded96d031b74183 (diff)
parent05d9e1bee565ac0448c779a00d8d637341390cf7 (diff)
downloadvolse-hubzilla-f23bdde464ef20ad2ffcb3984cc9481955374809.tar.gz
volse-hubzilla-f23bdde464ef20ad2ffcb3984cc9481955374809.tar.bz2
volse-hubzilla-f23bdde464ef20ad2ffcb3984cc9481955374809.zip
Merge branch 'dev' 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'];