diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-02 11:02:15 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-02 11:02:15 +0200 |
| commit | f23bdde464ef20ad2ffcb3984cc9481955374809 (patch) | |
| tree | 5f1d46f3f513ecf2d788b842c0dd01cbd9ac1a99 /Zotlabs/Module/Poke.php | |
| parent | c1039977f1d64611d2c793f3aded96d031b74183 (diff) | |
| parent | 05d9e1bee565ac0448c779a00d8d637341390cf7 (diff) | |
| download | volse-hubzilla-f23bdde464ef20ad2ffcb3984cc9481955374809.tar.gz volse-hubzilla-f23bdde464ef20ad2ffcb3984cc9481955374809.tar.bz2 volse-hubzilla-f23bdde464ef20ad2ffcb3984cc9481955374809.zip | |
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Module/Poke.php')
| -rw-r--r-- | Zotlabs/Module/Poke.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Poke.php b/Zotlabs/Module/Poke.php index 123ecbc7b..cf8d83023 100644 --- a/Zotlabs/Module/Poke.php +++ b/Zotlabs/Module/Poke.php @@ -115,7 +115,7 @@ class Poke extends \Zotlabs\Web\Controller { ), ); - $arr['object'] = json_encode($obj); + $arr['obj'] = json_encode($obj); $arr['item_origin'] = 1; $arr['item_wall'] = 1; |