Fix return for empty Shared folder in opendir()

This commit is contained in:
Michael Gapczynski 2012-01-01 14:04:16 -05:00
parent eb4cd86910
commit 64a24191a3
1 changed files with 8 additions and 12 deletions

View File

@ -79,20 +79,16 @@ class OC_Filestorage_Shared extends OC_Filestorage {
if ($path == "" || $path == "/") { if ($path == "" || $path == "/") {
$path = $this->datadir.$path; $path = $this->datadir.$path;
$sharedItems = OC_Share::getItemsInFolder($path); $sharedItems = OC_Share::getItemsInFolder($path);
if (empty($sharedItems)) { global $FAKEDIRS;
return false; $files = array();
} else { foreach ($sharedItems as $item) {
global $FAKEDIRS; // If item is in the root of the shared storage provider and the item exists add it to the fakedirs
$files = array(); if (dirname($item['target'])."/" == $path && $this->file_exists(basename($item['target']))) {
foreach ($sharedItems as $item) { $files[] = basename($item['target']);
// 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 { } else {
$source = $this->getSource($path); $source = $this->getSource($path);
if ($source) { if ($source) {