diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-25 17:56:40 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-25 17:56:40 -0500 |
| commit | 4a05e8820f5ff376c7e6076aee0b2c2e2c9cc94c (patch) | |
| tree | 8486ff4dbafd1c6e892695b37e7346057759a413 /lib/files/storage | |
| parent | 05a8766cbc5826a89e52248994e3e2d0b6c57be5 (diff) | |
| parent | d713948d3f85a6e0a369bf1a9052ce563250e3da (diff) | |
| download | nextcloud-server-4a05e8820f5ff376c7e6076aee0b2c2e2c9cc94c.tar.gz nextcloud-server-4a05e8820f5ff376c7e6076aee0b2c2e2c9cc94c.zip | |
Merge branch 'master' into external_storage_ui_feedback
Diffstat (limited to 'lib/files/storage')
| -rw-r--r-- | lib/files/storage/common.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php index f23dcf0d4eb..488a3f357c3 100644 --- a/lib/files/storage/common.php +++ b/lib/files/storage/common.php @@ -97,8 +97,8 @@ abstract class Common implements \OC\Files\Storage\Storage { public function copy($path1, $path2) { $source=$this->fopen($path1, 'r'); $target=$this->fopen($path2, 'w'); - $count=\OC_Helper::streamCopy($source, $target); - return $count>0; + list($count, $result) = \OC_Helper::streamCopy($source, $target); + return $result; } /** @@ -278,7 +278,7 @@ abstract class Common implements \OC\Files\Storage\Storage { return uniqid(); } } - + /** * clean a path, i.e. remove all redundant '.' and '..' * making sure that it can't point to higher than '/' @@ -289,7 +289,7 @@ abstract class Common implements \OC\Files\Storage\Storage { if (strlen($path) == 0 or $path[0] != '/') { $path = '/' . $path; } - + $output = array(); foreach (explode('/', $path) as $chunk) { if ($chunk == '..') { |