From fa8814902e9012880179e61ea846a7d85e3079f8 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@karoshi.org.uk>
Date: Sun, 13 Apr 2014 13:47:08 +0100
Subject: [PATCH] Adjust logic for deciding if trashbin empty

Any error in opening the trashbin directory returns 'true' for isEmpty.
An error is prevented by checking if the directory exists before trying to
open it.
---
 apps/files_trashbin/lib/trashbin.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 7b14a4ec081..bf8d465e5de 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -921,13 +921,11 @@ class Trashbin {
 	public static function isEmpty($user) {
 
 		$view = new \OC\Files\View('/' . $user . '/files_trashbin');
-		$dh = $view->opendir('/files');
-		if (!$dh) {
-			return false;
-		}
-		while ($file = readdir($dh)) {
-			if ($file !== '.' and $file !== '..') {
-				return false;
+		if ($view->is_dir('/files') && $dh = $view->opendir('/files')) {
+			while ($file = readdir($dh)) {
+				if ($file !== '.' and $file !== '..') {
+					return false;
+				}
 			}
 		}
 		return true;
-- 
2.39.5