disable trahs in files_sharing/public.php

diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index bf57790684292e7457bb8a4ca1a0b9451409fee1..4f8623573cb10c2cfcf1a401424dab93a6045194 100644 (file)
--- 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 99b74da6a1a978d19ecd03ab4ffd7cef4e4609d3..3c902ea9a3ad61614c923b1fd1f64fea2e17de53 100644 (file)
--- 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());