diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-16 15:45:55 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-16 15:45:55 +0200 |
| commit | fdeef5e874ae7a8e4a23a737e5a1e948804d768a (patch) | |
| tree | 2cc093162b583210b8f878f5ab9d670c270cff2e /lib/private/helper.php | |
| parent | 60541358ac375652d74e4a5b5d8cad865833aa92 (diff) | |
| parent | c3f7d22adc59949ad41c33d450b6d3e226cdefdb (diff) | |
| download | nextcloud-server-fdeef5e874ae7a8e4a23a737e5a1e948804d768a.tar.gz nextcloud-server-fdeef5e874ae7a8e4a23a737e5a1e948804d768a.zip | |
Merge branch 'master' into fixing-appframework-master
Conflicts:
lib/private/appframework/middleware/security/securitymiddleware.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
Diffstat (limited to 'lib/private/helper.php')
| -rw-r--r-- | lib/private/helper.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/helper.php b/lib/private/helper.php index f3f2ea9492a..e9b129db0ca 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -509,11 +509,11 @@ class OC_Helper { * * @param resource $source * @param resource $target - * @return int the number of bytes copied + * @return array the number of bytes copied and result */ public static function streamCopy($source, $target) { if (!$source or !$target) { - return false; + return array(0, false); } $result = true; $count = 0; |