aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKlaus Weidenbach <Klaus.Weidenbach@gmx.net>2014-06-24 21:05:00 +0200
committerKlaus Weidenbach <Klaus.Weidenbach@gmx.net>2014-06-24 21:05:00 +0200
commita6403905ef51194c09b5c63983ea9be9455dfc96 (patch)
treecce100eceb9a3fe56b30f98c727c7d01d405c43a
parenta2108570c12684f05b31d6c75db96f901391dca5 (diff)
downloadvolse-hubzilla-a6403905ef51194c09b5c63983ea9be9455dfc96.tar.gz
volse-hubzilla-a6403905ef51194c09b5c63983ea9be9455dfc96.tar.bz2
volse-hubzilla-a6403905ef51194c09b5c63983ea9be9455dfc96.zip
Set backlink to the parent folder, not cloud's root.
If you edit a file and click on the backlink you always returned to the root folder of your cloud. This patch sets the correct parent folder as backlink. Bit messy, but looks like it works.
-rw-r--r--mod/filestorage.php2
-rw-r--r--view/tpl/attach_edit.tpl2
2 files changed, 3 insertions, 1 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'),
diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index 0d3d2c571..e91b4c0c6 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -1,4 +1,4 @@
-<div id="attach-edit-backlink">< <a href="cloud/{{$channelnick}}">{{$backlink}}</a></div>
+<div id="attach-edit-backlink">< <a href="{{$parentpath}}">{{$backlink}}</a></div>
<h1>{{$header}}</h1>