diff options
| author | Habeas Codice <habeascodice@federated.social> | 2015-01-21 21:27:07 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2015-01-21 21:27:07 -0800 |
| commit | c05f0ec40784a17de2e675c4d684d3a0c54228b0 (patch) | |
| tree | fdab07506568d57c9abbac72511c5c04ea46f2fd /mod/filestorage.php | |
| parent | 6d291d880e14c0489277fd670f235bdb60bcfcd5 (diff) | |
| parent | 7d0e0366b946093f81e1ea4e358697fe5a22be64 (diff) | |
| download | volse-hubzilla-c05f0ec40784a17de2e675c4d684d3a0c54228b0.tar.gz volse-hubzilla-c05f0ec40784a17de2e675c4d684d3a0c54228b0.tar.bz2 volse-hubzilla-c05f0ec40784a17de2e675c4d684d3a0c54228b0.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod/filestorage.php')
| -rw-r--r-- | mod/filestorage.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mod/filestorage.php b/mod/filestorage.php index 67abc2eab..9852f4e73 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -21,7 +21,6 @@ function filestorage_post(&$a) { $recurse = ((x($_POST, 'recurse')) ? intval($_POST['recurse']) : 0); $resource = ((x($_POST, 'filehash')) ? notags($_POST['filehash']) : ''); - $no_activity = ((x($_POST, 'no_activity')) ? intval($_POST['no_activity']) : 0); if(! $resource) { @@ -40,10 +39,7 @@ function filestorage_post(&$a) { $channel = $a->get_channel(); $cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource); - $filename = find_filename_by_hash($channel_id, $resource); - $url = $cloudPath . $filename; - - file_activity($channel_id, $resource, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $url, 'post', $no_activity); + file_activity($channel_id, $resource, $cloudPath, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, 'post', $no_activity); goaway($cloudPath); } |