aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2013-02-26 16:14:45 -0800
committerMichael Gapczynski <mtgap@owncloud.com>2013-02-26 16:14:45 -0800
commitf26c47743329679a9f2ade0b3fe778439050c5af (patch)
tree9c70c1b754fed45bf309f317f76dcdcefad0765f
parent348812f2ce0d79f1fcec7b18a05ebd0a7a2acc00 (diff)
parent25cf18f61489860b735d5ac8951a8671bfa23bd2 (diff)
downloadnextcloud-server-f26c47743329679a9f2ade0b3fe778439050c5af.tar.gz
nextcloud-server-f26c47743329679a9f2ade0b3fe778439050c5af.zip
Merge pull request #1949 from owncloud/fix-dropbox
Fix undefined root parameter in Dropbox storage
-rwxr-xr-xapps/files_external/lib/dropbox.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 11644e4a2c8..cb04e557f8a 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -40,8 +40,8 @@ class Dropbox extends \OC\Files\Storage\Common {
&& isset($params['token'])
&& isset($params['token_secret'])
) {
- $this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $params['root'];
- $this->root=isset($params['root'])?$params['root']:'';
+ $this->root = isset($params['root']) ? $params['root'] : '';
+ $this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root;
$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');