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/Sharedwithme.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/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']; |