From da951ba059209914849dd9a289ea3f398bbab70e Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 10 Mar 2015 16:30:13 +0100 Subject: Use the new IteratorDirectory instead of the fakedir wrapper --- lib/private/files/storage/dav.php | 5 ++--- lib/private/files/storage/local.php | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'lib/private/files/storage') diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php index e02f971b38b..4be587e7799 100644 --- a/lib/private/files/storage/dav.php +++ b/lib/private/files/storage/dav.php @@ -38,7 +38,7 @@ namespace OC\Files\Storage; use Exception; use OC\Files\Filesystem; use OC\Files\Stream\Close; -use OC\Files\Stream\Dir; +use Icewind\Streams\IteratorDirectory; use OC\MemCache\ArrayCache; use OCP\Constants; use OCP\Files; @@ -211,8 +211,7 @@ class DAV extends Common { $file = basename($file); $content[] = $file; } - Dir::register($id, $content); - return opendir('fakedir://' . $id); + return IteratorDirectory::wrap($content); } catch (ClientHttpException $e) { if ($e->getHttpStatus() === 404) { $this->statCache->clear($path . '/'); diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php index b7272b7d1f0..3676fe69131 100644 --- a/lib/private/files/storage/local.php +++ b/lib/private/files/storage/local.php @@ -35,7 +35,6 @@ */ namespace OC\Files\Storage; - /** * for local filestore, we only have to map the paths */ -- cgit v1.2.3