diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-02 22:32:50 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-02 22:32:50 -0400 |
| commit | b93e398674b375a3b14718fc6dd2a815aad9b387 (patch) | |
| tree | 7c2a8097e1c90a87cc8207b5fe08a064f4fa3ae8 /include/sharedwithme.php | |
| parent | b70c6809648bb3c78e5e26f9293727b3a7aa4025 (diff) | |
| parent | f9075e2a2feca0f37fdf568be6e6e53460aa9034 (diff) | |
| download | volse-hubzilla-b93e398674b375a3b14718fc6dd2a815aad9b387.tar.gz volse-hubzilla-b93e398674b375a3b14718fc6dd2a815aad9b387.tar.bz2 volse-hubzilla-b93e398674b375a3b14718fc6dd2a815aad9b387.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
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']; |