summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-11-21 12:06:35 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2013-11-21 12:06:35 +0100
commit9d16353e094a3567eb09f9626d8768890fe57cbc (patch)
treecc3352cce4cf5caf9656654a25fb6ad9cbb65cb0 /apps
parentc9646ddc4c23faebcd729b6d7061dbadaf475a10 (diff)
downloadnextcloud-server-9d16353e094a3567eb09f9626d8768890fe57cbc.tar.gz
nextcloud-server-9d16353e094a3567eb09f9626d8768890fe57cbc.zip
disable trahs in files_sharing/public.php
Diffstat (limited to 'apps')
-rw-r--r--apps/files/templates/index.php2
-rw-r--r--apps/files_sharing/public.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index bf577906842..4f8623573cb 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -25,7 +25,7 @@
data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" />
<a href="#" class="svg"></a>
</div>
- <?php if (!$_['isPublic'] && $_['trash'] ): ?>
+ <?php if ($_['trash']): ?>
<input id="trash" type="button" value="<?php p($l->t('Deleted files'));?>" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?>></input>
<?php endif; ?>
<div id="uploadprogresswrapper">
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 99b74da6a1a..3c902ea9a3a 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -238,6 +238,7 @@ if (isset($path)) {
$folder->assign('usedSpacePercent', 0);
$folder->assign('fileHeader', $fileHeader);
$folder->assign('disableSharing', true);
+ $folder->assign('trash', false);
$folder->assign('emptyContent', $emptyContent);
$folder->assign('ajaxLoad', false);
$tmpl->assign('folder', $folder->fetchPage());