From 64a24191a3880af5b8c574eb2482d479f9024677 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sun, 1 Jan 2012 14:04:16 -0500 Subject: [PATCH] Fix return for empty Shared folder in opendir() --- apps/files_sharing/sharedstorage.php | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php index d78e273bf3..b0eaeecf72 100644 --- a/apps/files_sharing/sharedstorage.php +++ b/apps/files_sharing/sharedstorage.php @@ -79,20 +79,16 @@ class OC_Filestorage_Shared extends OC_Filestorage { if ($path == "" || $path == "/") { $path = $this->datadir.$path; $sharedItems = OC_Share::getItemsInFolder($path); - if (empty($sharedItems)) { - return false; - } else { - global $FAKEDIRS; - $files = array(); - foreach ($sharedItems as $item) { - // If item is in the root of the shared storage provider and the item exists add it to the fakedirs - if (dirname($item['target'])."/" == $path && $this->file_exists(basename($item['target']))) { - $files[] = basename($item['target']); - } + global $FAKEDIRS; + $files = array(); + foreach ($sharedItems as $item) { + // If item is in the root of the shared storage provider and the item exists add it to the fakedirs + if (dirname($item['target'])."/" == $path && $this->file_exists(basename($item['target']))) { + $files[] = basename($item['target']); } - $FAKEDIRS['shared'] = $files; - return opendir('fakedir://shared'); } + $FAKEDIRS['shared'] = $files; + return opendir('fakedir://shared'); } else { $source = $this->getSource($path); if ($source) {