Skip to content
Snippets Groups Projects
Commit 19f94774 authored by Michael Gapczynski's avatar Michael Gapczynski
Browse files

Don't overwrite fake directory stream for Dropbox and Google Drive

parent c67ae2e7
Branches
No related tags found
No related merge requests found
...@@ -33,7 +33,6 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common { ...@@ -33,7 +33,6 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
$oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']); $oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
$oauth->setToken($params['token'], $params['token_secret']); $oauth->setToken($params['token'], $params['token_secret']);
$this->dropbox = new Dropbox_API($oauth, 'dropbox'); $this->dropbox = new Dropbox_API($oauth, 'dropbox');
} }
private function getMetaData($path, $list = false) { private function getMetaData($path, $list = false) {
...@@ -84,8 +83,8 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common { ...@@ -84,8 +83,8 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
foreach ($contents as $file) { foreach ($contents as $file) {
$files[] = basename($file['path']); $files[] = basename($file['path']);
} }
OC_FakeDirStream::$dirs['dropbox'] = $files; OC_FakeDirStream::$dirs['dropbox'.$path] = $files;
return opendir('fakedir://dropbox'); return opendir('fakedir://dropbox'.$path);
} }
return false; return false;
} }
......
...@@ -237,8 +237,8 @@ class OC_Filestorage_Google extends OC_Filestorage_Common { ...@@ -237,8 +237,8 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
$this->entries[$name] = $entry; $this->entries[$name] = $entry;
} }
} }
OC_FakeDirStream::$dirs['google'] = $files; OC_FakeDirStream::$dirs['google'.$path] = $files;
return opendir('fakedir://google'); return opendir('fakedir://google'.$path);
} }
public function stat($path) { public function stat($path) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment