diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 12:46:07 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 13:30:31 +0200 |
| commit | 54a3bdf1c5cab73fd9fbedbfb94c78c9f720855b (patch) | |
| tree | f3bc10b3143d1e187e2987060f6acedd5c3eb945 /apps/files_trashbin | |
| parent | 268d346b369f5afb630decb3e9b4e6cd9a7c124f (diff) | |
| download | nextcloud-server-54a3bdf1c5cab73fd9fbedbfb94c78c9f720855b.tar.gz nextcloud-server-54a3bdf1c5cab73fd9fbedbfb94c78c9f720855b.zip | |
fixing unit test execution related to trashbin
Diffstat (limited to 'apps/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/lib/storage.php | 2 |
1 files changed, 1 insertions, 1 deletions
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); |