aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Share.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/Share.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/Share.php')
-rw-r--r--Zotlabs/Module/Share.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php
index 73db01657..fcc2486ba 100644
--- a/Zotlabs/Module/Share.php
+++ b/Zotlabs/Module/Share.php
@@ -48,7 +48,7 @@ class Share extends \Zotlabs\Web\Controller {
$is_photo = (($r[0]['obj_type'] === ACTIVITY_OBJ_PHOTO) ? true : false);
if($is_photo) {
- $object = json_decode($r[0]['object'],true);
+ $object = json_decode($r[0]['obj'],true);
$photo_bb = $object['body'];
}