diff options
| author | marijus <mario@mariovavti.com> | 2015-01-23 14:50:39 +0100 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2015-01-23 14:50:39 +0100 |
| commit | 8789c96e78734cbc5420404eff149e514fe17ee7 (patch) | |
| tree | 4cde930f8818b61e76d5cfb3ab0338a10e35df2e /mod | |
| parent | e87437626867caf133eee2ef7cdba39506497eab (diff) | |
| download | volse-hubzilla-8789c96e78734cbc5420404eff149e514fe17ee7.tar.gz volse-hubzilla-8789c96e78734cbc5420404eff149e514fe17ee7.tar.bz2 volse-hubzilla-8789c96e78734cbc5420404eff149e514fe17ee7.zip | |
some code restructure
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/filestorage.php | 3 | ||||
| -rw-r--r-- | mod/sharedwithme.php | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mod/filestorage.php b/mod/filestorage.php index 9852f4e73..05f6a79e6 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -38,8 +38,9 @@ function filestorage_post(&$a) { //Build directory tree and redirect $channel = $a->get_channel(); $cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource); + $object = get_file_activity_object($channel_id, $resource, $cloudPath); - file_activity($channel_id, $resource, $cloudPath, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, 'post', $no_activity); + file_activity($channel_id, $object, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, 'post', $no_activity); goaway($cloudPath); } diff --git a/mod/sharedwithme.php b/mod/sharedwithme.php index baaf41f61..bbb9c2aef 100644 --- a/mod/sharedwithme.php +++ b/mod/sharedwithme.php @@ -48,9 +48,9 @@ function sharedwithme_content(&$a) { else { - $z = q("DELETE FROM item WHERE (obj_type = '%s' AND object LIKE '%s') AND (verb = '%s' OR verb = '%s')", + $z = q("DELETE FROM item WHERE (obj_type = '%s' AND object = '%s') AND (verb = '%s' OR verb = '%s')", dbesc(ACTIVITY_OBJ_FILE), - dbesc('%"hash":"' . $hash . '"%'), + dbesc($xx['object']), dbesc(ACTIVITY_POST), dbesc(ACTIVITY_UPDATE) ); |