diff options
author | Thomas Tanghus <thomas@tanghus.net> | 2012-01-01 20:07:01 +0100 |
---|---|---|
committer | Thomas Tanghus <thomas@tanghus.net> | 2012-01-01 20:07:01 +0100 |
commit | 853d1730c7edae49c7c98db1d15d3a7f0bfe195e (patch) | |
tree | ee86a35357c29a947225a0440ce8509bbce87ccb | |
parent | 929ce2b56621ceda47b910a0fea5452f01812554 (diff) | |
parent | 64a24191a3880af5b8c574eb2482d479f9024677 (diff) | |
download | nextcloud-server-853d1730c7edae49c7c98db1d15d3a7f0bfe195e.tar.gz nextcloud-server-853d1730c7edae49c7c98db1d15d3a7f0bfe195e.zip |
Merge git://gitorious.org/owncloud/owncloud into oc_image
-rw-r--r-- | apps/files_sharing/sharedstorage.php | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php index d78e273bf38..b0eaeecf723 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) { |