[Pkg-owncloud-commits] [owncloud] 36/239: disable trahs in files_sharing/public.php

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 9d16353e094a3567eb09f9626d8768890fe57cbc
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Thu Nov 21 12:06:35 2013 +0100

    disable trahs in files_sharing/public.php
---
 apps/files/templates/index.php | 2 +-
 apps/files_sharing/public.php  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index bf57790..4f86235 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 99b74da..3c902ea 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());

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git