diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2013-10-21 22:18:10 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2013-10-21 22:18:10 +0200 |
| commit | d1c27e08e56562c7b522c43d1f1b485ee9f1cd77 (patch) | |
| tree | 63625c8725d90a5dc550b50a425d69f27023c485 | |
| parent | 732e7db31902e88e4ca6582c56af14b5e3d2bc39 (diff) | |
| download | nextcloud-server-d1c27e08e56562c7b522c43d1f1b485ee9f1cd77.tar.gz nextcloud-server-d1c27e08e56562c7b522c43d1f1b485ee9f1cd77.zip | |
Fixed empty content logic
- Remove obsolete code that used another approach for hiding emptycontent
- Fixed logic for the showing of the empty content message
| -rw-r--r-- | apps/files/index.php | 2 | ||||
| -rw-r--r-- | apps/files/templates/index.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/index.php b/apps/files/index.php index c2c0ba02a99..0b56d9c19a8 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -120,7 +120,7 @@ if ($needUpgrade) { $isCreatable = \OC\Files\Filesystem::isCreatable($dir . '/'); $fileHeader = (!isset($files) or count($files) > 0); - $emptyContent = $isCreatable or $fileHeader or $ajaxLoad; + $emptyContent = ($isCreatable and !$fileHeader) or $ajaxLoad; OCP\Util::addscript('files', 'fileactions'); OCP\Util::addscript('files', 'files'); diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index c1373c3e9d5..5a686da43f8 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -1,6 +1,6 @@ <div id="controls"> <?php print_unescaped($_['breadcrumb']); ?> - <div class="actions creatable <?php if (!$_['isCreatable']):?>hidden<?php endif; ?> <?php if (isset($_['files']) and count($_['files'])==0):?>emptycontent<?php endif; ?>"> + <div class="actions creatable <?php if (!$_['isCreatable']):?>hidden<?php endif; ?>"> <div id="new" class="button"> <a><?php p($l->t('New'));?></a> <ul> |