diff options
author | Michael Meer <michael@meer.name> | 2014-01-27 10:37:15 +0100 |
---|---|---|
committer | Michael Meer <michael@meer.name> | 2014-01-27 10:37:15 +0100 |
commit | a3bf272753183f61723fea5dccd52abe6f0662dd (patch) | |
tree | 70a7e3a2e4ed5544abbddb8ee73226b638c01099 /mod/filestorage.php | |
parent | 844df110586e6726581c620754fef5419f6bea5e (diff) | |
parent | d67fdd129921549b6a1e7cb5e5ebea7bdc38bf0e (diff) | |
download | volse-hubzilla-a3bf272753183f61723fea5dccd52abe6f0662dd.tar.gz volse-hubzilla-a3bf272753183f61723fea5dccd52abe6f0662dd.tar.bz2 volse-hubzilla-a3bf272753183f61723fea5dccd52abe6f0662dd.zip |
Merge branch 'master' of https://github.com/MicMee/red
to be in sync
Diffstat (limited to 'mod/filestorage.php')
-rw-r--r-- | mod/filestorage.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mod/filestorage.php b/mod/filestorage.php index 18760dd45..3e53a1e93 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -69,7 +69,6 @@ function filestorage_content(&$a) { return; } - // TODO This will also need to check for files on disk and delete them from there as well as the DB. if(argc() > 3 && argv(3) === 'delete') { if(! $perms['write_storage']) { @@ -110,7 +109,7 @@ function filestorage_content(&$a) { $channel = $a->get_channel(); - $cloudpath = get_cloudpath($f); + $cloudpath = get_cloudpath($f) . (($f['flags'] & ATTACH_FLAG_DIR) ? '?f=&davguest=1' : ''); $aclselect_e = populate_acl($f); $is_a_dir = (($f['flags'] & ATTACH_FLAG_DIR) ? true : false); |