diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-08-19 17:30:56 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-19 17:30:56 +0200 |
| commit | cbeccb2fcd3d3d445726c9e0cd5b8e6c8285a1ea (patch) | |
| tree | a262c1ad4511a04922519a868a7733a7b1794f3a /apps | |
| parent | c5402f457530577999d1adc1715c76e742ad8aa9 (diff) | |
| parent | 95e1b62940444eb2a7467d994a7b4366f6e7f2fc (diff) | |
| download | nextcloud-server-cbeccb2fcd3d3d445726c9e0cd5b8e6c8285a1ea.tar.gz nextcloud-server-cbeccb2fcd3d3d445726c9e0cd5b8e6c8285a1ea.zip | |
Merge branch 'master' into readdir-strict-equals
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_external/lib/google.php | 2 | ||||
| -rw-r--r-- | apps/files_external/lib/webdav.php | 6 | ||||
| -rw-r--r-- | apps/files_sharing/lib/sharedstorage.php | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index b27b9ae3f32..215bdcda6c2 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -284,7 +284,7 @@ class Google extends \OC\Files\Storage\Common { // Check if this is a Google Doc if ($this->getMimeType($path) !== $file->getMimeType()) { // Return unknown file size - $stat['size'] = \OC\Files\FREE_SPACE_UNKNOWN; + $stat['size'] = \OC\Files\SPACE_UNKNOWN; } else { $stat['size'] = $file->getFileSize(); } diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php index f98be318f1c..66920fc9f64 100644 --- a/apps/files_external/lib/webdav.php +++ b/apps/files_external/lib/webdav.php @@ -171,7 +171,7 @@ class DAV extends \OC\Files\Storage\Common{ $curl = curl_init(); $fp = fopen('php://temp', 'r+'); curl_setopt($curl, CURLOPT_USERPWD, $this->user.':'.$this->password); - curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().$path); + curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().str_replace(' ', '%20', $path)); curl_setopt($curl, CURLOPT_FILE, $fp); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); @@ -225,7 +225,7 @@ class DAV extends \OC\Files\Storage\Common{ return 0; } } catch(\Exception $e) { - return \OC\Files\FREE_SPACE_UNKNOWN; + return \OC\Files\SPACE_UNKNOWN; } } @@ -256,7 +256,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().$target); + curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().str_replace(' ', '%20', $target)); curl_setopt($curl, CURLOPT_BINARYTRANSFER, true); curl_setopt($curl, CURLOPT_INFILE, $source); // file pointer curl_setopt($curl, CURLOPT_INFILESIZE, filesize($path)); diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 5c23a9eb0d0..7384b094cb0 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -391,7 +391,7 @@ class Shared extends \OC\Files\Storage\Common { public function free_space($path) { if ($path == '') { - return \OC\Files\FREE_SPACE_UNKNOWN; + return \OC\Files\SPACE_UNKNOWN; } $source = $this->getSourcePath($path); if ($source) { |