aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorPaolo Tacconi <p.tacconi@giunti.it>2014-06-25 11:58:28 +0200
committerPaolo Tacconi <p.tacconi@giunti.it>2014-06-25 11:58:28 +0200
commita2629258ae325adb1f2d11d1b2ce2cc6ecef40e1 (patch)
tree86676e89973c6bc1d0c60de282c48ff896a3e5d6 /mod
parent378aaf4a61176832f91cf8a95b3962915ee13708 (diff)
parent695afefd4b006a180fce1df2debb575cbdd0c0ea (diff)
downloadvolse-hubzilla-a2629258ae325adb1f2d11d1b2ce2cc6ecef40e1.tar.gz
volse-hubzilla-a2629258ae325adb1f2d11d1b2ce2cc6ecef40e1.tar.bz2
volse-hubzilla-a2629258ae325adb1f2d11d1b2ce2cc6ecef40e1.zip
Merge branch 'master' of https://github.com/tuscanhobbit/red
Diffstat (limited to 'mod')
-rw-r--r--mod/filestorage.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/mod/filestorage.php b/mod/filestorage.php
index 6a7eac706..383af84fc 100644
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -110,6 +110,7 @@ function filestorage_content(&$a) {
$channel = $a->get_channel();
$cloudpath = get_cloudpath($f) . (($f['flags'] & ATTACH_FLAG_DIR) ? '?f=&davguest=1' : '');
+ $parentpath = get_parent_cloudpath($channel['channel_id'], $channel['channel_address'], $f['hash']);
$aclselect_e = populate_acl($f,false);
$is_a_dir = (($f['flags'] & ATTACH_FLAG_DIR) ? true : false);
@@ -121,6 +122,7 @@ function filestorage_content(&$a) {
'$header' => t('Edit file permissions'),
'$file' => $f,
'$cloudpath' => z_root() . '/' . $cloudpath,
+ '$parentpath' => $parentpath,
'$uid' => $channel['channel_id'],
'$channelnick' => $channel['channel_address'],
'$permissions' => t('Permissions'),