From d1c27e08e56562c7b522c43d1f1b485ee9f1cd77 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 21 Oct 2013 22:18:10 +0200
Subject: [PATCH] Fixed empty content logic

- Remove obsolete code that used another approach for hiding emptycontent
- Fixed logic for the showing of the empty content message
---
 apps/files/index.php           | 2 +-
 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 c2c0ba02a9..0b56d9c19a 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 c1373c3e9d..5a686da43f 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>