From 19f94774fbc72562f2a3280b0cc49fbda89ea48b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 27 Jun 2012 12:04:11 -0400
Subject: [PATCH] Don't overwrite fake directory stream for Dropbox and Google
Drive
---
apps/files_external/lib/dropbox.php | 5 ++---
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 6f1a154a12..e3fbb24499 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 fe60a06629..41b560ae84 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) {
--
GitLab