diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-03 11:04:16 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-03 11:04:16 +0200 |
| commit | 25aded6b9b137a32d9f9ea68baf3e2102fb293e7 (patch) | |
| tree | e448899f37eb48e6ee2a5ffdb4fd55bf5e9a779b /Zotlabs/Module/Share.php | |
| parent | b4eb9f2a1142cf121dd41ea0ad81475d38343308 (diff) | |
| parent | 8d6c2b5d4a799d87df1cd9f6f258890045ce6c62 (diff) | |
| download | volse-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/Share.php')
| -rw-r--r-- | Zotlabs/Module/Share.php | 2 |
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']; } |