diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-19 19:12:14 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-19 19:12:14 -0500 |
| commit | 702c27b0e63cddb21f483c0a69e899e08b42ec07 (patch) | |
| tree | 5235c4b45c2de00c9d5633e25ad5142388587f1f /apps/files_external/lib/swift.php | |
| parent | 037c3ee4ecf6f3ffae0f1707074ac13b234dc1ec (diff) | |
| parent | 38782036798dbe0a34995a3fca0aa92583cb9099 (diff) | |
| download | nextcloud-server-702c27b0e63cddb21f483c0a69e899e08b42ec07.tar.gz nextcloud-server-702c27b0e63cddb21f483c0a69e899e08b42ec07.zip | |
Merge branch 'master' into external_storage_ui_feedback
Conflicts:
apps/files_external/js/settings.js
apps/files_external/lib/smb.php
apps/files_external/templates/settings.php
lib/files/storage/common.php
Diffstat (limited to 'apps/files_external/lib/swift.php')
| -rw-r--r-- | apps/files_external/lib/swift.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php index 20af67cb8b6..68c4b48f17c 100644 --- a/apps/files_external/lib/swift.php +++ b/apps/files_external/lib/swift.php @@ -210,7 +210,7 @@ class SWIFT extends \OC\Files\Storage\Common{ return false; } else { $fh=fopen($tmpFile, 'a'); - fwrite($fh,$name . "\n"); + fwrite($fh, $name . "\n"); } } catch(\Exception $e) { file_put_contents($tmpFile, $name . "\n"); @@ -294,7 +294,7 @@ class SWIFT extends \OC\Files\Storage\Common{ } private function init(){ - if($this->ready){ + if($this->ready) { return; } $this->ready = true; @@ -482,10 +482,6 @@ class SWIFT extends \OC\Files\Storage\Common{ } } - public function free_space($path) { - return 1024*1024*1024*8; - } - public function touch($path, $mtime=null) { $this->init(); $obj=$this->getObject($path); |