diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-11 22:54:39 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-11 22:54:39 +0200 |
| commit | fb2d2bc2011c371ff1e4334f84494f15a84a07a2 (patch) | |
| tree | b5c20c842441ce4288038909daa5a158c8e74e80 /3rdparty/php-cloudfiles/cloudfiles.php | |
| parent | 5c6e9518edde10e0c23d0d734d2cc6d161fc15c0 (diff) | |
| parent | ee28e35ba93032a3d43601c030d3d44df9b092f0 (diff) | |
| download | nextcloud-server-fb2d2bc2011c371ff1e4334f84494f15a84a07a2.tar.gz nextcloud-server-fb2d2bc2011c371ff1e4334f84494f15a84a07a2.zip | |
merge master into filesystem
Diffstat (limited to '3rdparty/php-cloudfiles/cloudfiles.php')
| -rw-r--r-- | 3rdparty/php-cloudfiles/cloudfiles.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/3rdparty/php-cloudfiles/cloudfiles.php b/3rdparty/php-cloudfiles/cloudfiles.php index 5f7e2100a99..7b1014265e5 100644 --- a/3rdparty/php-cloudfiles/cloudfiles.php +++ b/3rdparty/php-cloudfiles/cloudfiles.php @@ -2000,7 +2000,7 @@ class CF_Object // } //use OC's mimetype detection for files - if(is_file($handle)){ + if(@is_file($handle)){ $this->content_type=OC_Helper::getMimeType($handle); }else{ $this->content_type=OC_Helper::getStringMimeType($handle); @@ -2537,7 +2537,7 @@ class CF_Object } $md5 = hash_final($ctx, false); rewind($data); - } elseif ((string)is_file($data)) { + } elseif ((string)@is_file($data)) { $md5 = md5_file($data); } else { $md5 = md5($data); |