summaryrefslogtreecommitdiffstats
path: root/apps/files_external/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-04-03 17:04:16 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-04-03 17:04:16 +0200
commit14a53819777f5cb829aa15f8d749c9ae71d39b4e (patch)
treebd32bfd88a60ac20a7d5a00a559fffb705a9279e /apps/files_external/lib
parentc0ebc1dfb1108b7cbe0fa134def00aa6ce0066b3 (diff)
parente2969062ca172b46713653ac243bb849a54ca7d7 (diff)
downloadnextcloud-server-14a53819777f5cb829aa15f8d749c9ae71d39b4e.tar.gz
nextcloud-server-14a53819777f5cb829aa15f8d749c9ae71d39b4e.zip
Merge branch 'master' into fs-backend-registration
Conflicts: apps/files_external/templates/settings.php
Diffstat (limited to 'apps/files_external/lib')
-rw-r--r--apps/files_external/lib/webdav.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index b43c65e8e6c..dc98dcfb808 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -267,7 +267,7 @@ class DAV extends \OC\Files\Storage\Common {
$curl = curl_init();
curl_setopt($curl, CURLOPT_USERPWD, $this->user . ':' . $this->password);
- curl_setopt($curl, CURLOPT_URL, $this->createBaseUri() . str_replace(' ', '%20', $target));
+ curl_setopt($curl, CURLOPT_URL, $this->createBaseUri() . $this->encodePath($target));
curl_setopt($curl, CURLOPT_BINARYTRANSFER, true);
curl_setopt($curl, CURLOPT_INFILE, $source); // file pointer
curl_setopt($curl, CURLOPT_INFILESIZE, filesize($path));