don't show empty trash bin message for sub folders

diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 8f8d143b4d11ccc7491f41993c3955725804d8c6..d575c75f1a3485e7bc07661f727f1d6cc32222c2 100644 (file)
--- 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 c3e51b4becdfe4d5aad5e30a61c508453416000f..b62ca0af00c09c9c434f26e2b0d7f6ecef57733b 100644 (file)
--- 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; ?>