From 2d6efae25714b188d4e689617b2e4ae8695b0317 Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Wed, 20 Feb 2013 22:19:23 +0100
Subject: update path to deleted files

---
 apps/files_trashbin/index.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'apps/files_trashbin/index.php')

diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index a2d4cc0a44d..8f8d143b4d1 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -9,7 +9,7 @@ OCP\Util::addScript('files', 'fileactions');
 $tmpl = new OCP\Template('files_trashbin', 'index', 'user');
 
 $user = \OCP\User::getUser();
-$view = new OC_Filesystemview('/'.$user.'/files_trashbin');
+$view = new OC_Filesystemview('/'.$user.'/files_trashbin/files');
 
 OCP\Util::addStyle('files', 'files');
 OCP\Util::addScript('files', 'filelist');
@@ -17,8 +17,7 @@ OCP\Util::addScript('files', 'filelist');
 $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
 
 if ($dir) {
-	$dirlisting = true;
-	$view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_trashbin');
+	$dirlisting = true;
 	$fullpath = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($dir);
 	$dirContent = opendir($fullpath);
 	$i = 0;
-- 
cgit v1.2.3


From fc1fba23040908fe5629f89b66a280aea5578520 Mon Sep 17 00:00:00 2001
From: Björn Schießle <schiessle@owncloud.com>
Date: Thu, 21 Feb 2013 00:02:52 +0100
Subject: don't show empty trash bin message for sub folders

---
 apps/files_trashbin/index.php           | 1 +
 apps/files_trashbin/templates/index.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'apps/files_trashbin/index.php')

diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 8f8d143b4d1..d575c75f1a3 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -94,6 +94,7 @@ $list->assign('disableDownloadActions', true);
 $tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
 $tmpl->assign('fileList', $list->fetchPage(), false);
 $tmpl->assign('files', $files);
+$tmpl->assign('dirlisting', $dirlisting);
 $tmpl->assign('dir', OC_Filesystem::normalizePath($view->getAbsolutePath()));
 
 $tmpl->printPage();
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index c3e51b4becd..b62ca0af00c 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -5,7 +5,7 @@
 </div>
 <div id='notification'></div>
 
-<?php if (isset($_['files']) && count($_['files'])==0):?>
+<?php if (isset($_['files']) && count($_['files'])==0 && $_['dirlisting'] == false):?>
 	<div id="emptyfolder"><?php echo $l->t('Nothing in here. Your trash bin is empty!')?></div>
 <?php endif; ?>
 
-- 
cgit v1.2.3