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 /include/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 'include/sharedwithme.php')
| -rw-r--r-- | include/sharedwithme.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sharedwithme.php b/include/sharedwithme.php index b01764ad3..b342f51d5 100644 --- a/include/sharedwithme.php +++ b/include/sharedwithme.php @@ -3,7 +3,7 @@ function apply_updates() { //check for updated items and remove them - $x = q("SELECT mid, max(object) AS object FROM item WHERE verb = '%s' AND obj_type = '%s' GROUP BY mid", + $x = q("SELECT mid, max(obj) AS obj FROM item WHERE verb = '%s' AND obj_type = '%s' GROUP BY mid", dbesc(ACTIVITY_UPDATE), dbesc(ACTIVITY_OBJ_FILE) ); @@ -12,7 +12,7 @@ function apply_updates() { foreach($x as $xx) { - $object = json_decode($xx['object'],true); + $object = json_decode($xx['obj'],true); $d_mid = $object['d_mid']; $u_mid = $xx['mid']; |