diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-02-21 00:02:52 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-02-21 00:02:52 +0100 |
| commit | fc1fba23040908fe5629f89b66a280aea5578520 (patch) | |
| tree | 6d1e3071599a2caa76b66f016cb634288c153ead | |
| parent | 2d6efae25714b188d4e689617b2e4ae8695b0317 (diff) | |
| download | nextcloud-server-fc1fba23040908fe5629f89b66a280aea5578520.tar.gz nextcloud-server-fc1fba23040908fe5629f89b66a280aea5578520.zip | |
don't show empty trash bin message for sub folders
| -rw-r--r-- | apps/files_trashbin/index.php | 1 | ||||
| -rw-r--r-- | apps/files_trashbin/templates/index.php | 2 |
2 files changed, 2 insertions, 1 deletions
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; ?> |