From 54a3bdf1c5cab73fd9fbedbfb94c78c9f720855b Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Tue, 7 Apr 2015 12:46:07 +0200
Subject: fixing unit test execution related to trashbin

---
 apps/files_trashbin/lib/storage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apps/files_trashbin/lib')

diff --git a/apps/files_trashbin/lib/storage.php b/apps/files_trashbin/lib/storage.php
index df80649a50b..61e0816fd24 100644
--- a/apps/files_trashbin/lib/storage.php
+++ b/apps/files_trashbin/lib/storage.php
@@ -84,7 +84,7 @@ class Storage extends Wrapper {
 	 * @param string $path
 	 */
 	public function unlink($path) {
-		if (self::$disableTrash) {
+		if (self::$disableTrash || !\OC_App::isEnabled('files_trashbin')) {
 			return $this->storage->unlink($path);
 		}
 		$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);
-- 
cgit v1.2.3