Merge branch 'master' into tres and add some work on the item_deleted flag refactor

Conflicts:
	include/attach.php
	include/onedirsync.php
	include/zot.php
	mod/locs.php

1 files changed, 2 insertions, 5 deletions

diff --git a/mod/filestorage.php b/mod/filestorage.php
index 67abc2eab..05f6a79e6 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) {
@@ -39,11 +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);
 
-	$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, $object, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, 'post', $no_activity);
 
 	goaway($cloudPath);
 }