diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-06-27 12:04:11 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-06-27 12:04:33 -0400 |
| commit | 19f94774fbc72562f2a3280b0cc49fbda89ea48b (patch) | |
| tree | dd4dc21499b00ee3fcea97d54047c5e354c485ec | |
| parent | c67ae2e7f1bbb352158728394259c74de11aa989 (diff) | |
| download | nextcloud-server-19f94774fbc72562f2a3280b0cc49fbda89ea48b.tar.gz nextcloud-server-19f94774fbc72562f2a3280b0cc49fbda89ea48b.zip | |
Don't overwrite fake directory stream for Dropbox and Google Drive
| -rwxr-xr-x | apps/files_external/lib/dropbox.php | 5 | ||||
| -rw-r--r-- | apps/files_external/lib/google.php | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php index 6f1a154a122..e3fbb244996 100755 --- a/apps/files_external/lib/dropbox.php +++ b/apps/files_external/lib/dropbox.php @@ -33,7 +33,6 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common { $oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']); $oauth->setToken($params['token'], $params['token_secret']); $this->dropbox = new Dropbox_API($oauth, 'dropbox'); - } private function getMetaData($path, $list = false) { @@ -84,8 +83,8 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common { foreach ($contents as $file) { $files[] = basename($file['path']); } - OC_FakeDirStream::$dirs['dropbox'] = $files; - return opendir('fakedir://dropbox'); + OC_FakeDirStream::$dirs['dropbox'.$path] = $files; + return opendir('fakedir://dropbox'.$path); } return false; } diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index fe60a06629a..41b560ae84e 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -237,8 +237,8 @@ class OC_Filestorage_Google extends OC_Filestorage_Common { $this->entries[$name] = $entry; } } - OC_FakeDirStream::$dirs['google'] = $files; - return opendir('fakedir://google'); + OC_FakeDirStream::$dirs['google'.$path] = $files; + return opendir('fakedir://google'.$path); } public function stat($path) { |