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/Sharedwithme.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/Sharedwithme.php')
| -rw-r--r-- | Zotlabs/Module/Sharedwithme.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Sharedwithme.php b/Zotlabs/Module/Sharedwithme.php index 8eaa47dba..25bc7dba3 100644 --- a/Zotlabs/Module/Sharedwithme.php +++ b/Zotlabs/Module/Sharedwithme.php @@ -46,7 +46,7 @@ class Sharedwithme extends \Zotlabs\Web\Controller { } //list files - $r = q("SELECT id, uid, object, item_unseen FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s'", + $r = q("SELECT id, uid, obj, item_unseen FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s'", dbesc(ACTIVITY_POST), dbesc(ACTIVITY_OBJ_FILE), intval(local_channel()), @@ -59,7 +59,7 @@ class Sharedwithme extends \Zotlabs\Web\Controller { if($r) { foreach($r as $rr) { - $object = json_decode($rr['object'],true); + $object = json_decode($rr['obj'],true); $item = array(); $item['id'] = $rr['id']; |