summaryrefslogtreecommitdiffstats
path: root/apps/files_external/lib/smb.php
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-02-12 11:01:14 +0100
committerThomas Mueller <thomas.mueller@tmit.eu>2013-02-12 11:01:14 +0100
commita953786d7952f2d758a8111302822708d906875e (patch)
tree167704bb6ad7debce5a38c46e795efb22aff63ea /apps/files_external/lib/smb.php
parent646d60ee83168169050271ee9d5442e2dc626e8a (diff)
parent2507e0da1d61af5d9a9506a29aa6df4c31ac068e (diff)
downloadnextcloud-server-a953786d7952f2d758a8111302822708d906875e.tar.gz
nextcloud-server-a953786d7952f2d758a8111302822708d906875e.zip
Merge branch 'master' into external_storage_ui_feedback
Diffstat (limited to 'apps/files_external/lib/smb.php')
-rw-r--r--apps/files_external/lib/smb.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index cea5de36817..989a53a4fc6 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -49,6 +49,7 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
if (substr($path, -1)=='/') {
$path=substr($path, 0, -1);
}
+ $path = urlencode($path);
return 'smb://'.$this->user.':'.$this->password.'@'.$this->host.$this->share.$this->root.$path;
}
@@ -63,11 +64,6 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
}
}
- public function filetype($path) {
- // using opendir causes the same amount of requests and caches the content of the folder in one go
- return (bool)@$this->opendir($path) ? 'dir' : 'file';
- }
-
/**
* check if a file or folder has been updated since $time
* @param string $path