diff options
| author | friendica <info@friendica.com> | 2015-01-21 18:34:31 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-21 18:34:31 -0800 |
| commit | 0010eaa41158cd897188b441a71d7fa39c78de02 (patch) | |
| tree | 7cab6506ee2ccb1ae6b50e2353c53d00aada4363 /mod/filestorage.php | |
| parent | 8472e706bc8c2be81a4426586d511de21c919209 (diff) | |
| parent | 200220ff367af9aab6b19a64ec259f5eb68efbea (diff) | |
| download | volse-hubzilla-0010eaa41158cd897188b441a71d7fa39c78de02.tar.gz volse-hubzilla-0010eaa41158cd897188b441a71d7fa39c78de02.tar.bz2 volse-hubzilla-0010eaa41158cd897188b441a71d7fa39c78de02.zip | |
Merge https://github.com/friendica/red into pending_merge
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); } |