diff options
| author | Qingping Hou <dave2008713@gmail.com> | 2013-02-25 17:16:03 -0500 |
|---|---|---|
| committer | Qingping Hou <dave2008713@gmail.com> | 2013-02-25 17:16:03 -0500 |
| commit | 195b52cb63eda3d8e3af6195058a0e1403e4dede (patch) | |
| tree | 4c79947d856f136051a84171eba913b1517a3bd1 /lib/files/storage | |
| parent | c111a3aa248bee2bff22318c2a3d0da32ea0e451 (diff) | |
| parent | d713948d3f85a6e0a369bf1a9052ce563250e3da (diff) | |
| download | nextcloud-server-195b52cb63eda3d8e3af6195058a0e1403e4dede.tar.gz nextcloud-server-195b52cb63eda3d8e3af6195058a0e1403e4dede.zip | |
Merge branch 'master' of github.com:owncloud/core into issue_1776
Conflicts:
core/templates/layout.user.php
Diffstat (limited to 'lib/files/storage')
| -rw-r--r-- | lib/files/storage/common.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php index 8faacdf01d8..f9c6bdfce0c 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; } /** |