summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-06-08 16:24:14 +0200
committerVincent Petry <pvince81@owncloud.com>2016-06-08 16:24:14 +0200
commit56215513e1339c0c80bcaa67740768893e62b454 (patch)
tree8d1d406c3fdae7caf739030285f86ec1a6d554d4 /apps
parent396363cc5de4041549d25e6626b432e2a235eb7a (diff)
parentfa9c96ac4f2801db453023b86e41431374b52260 (diff)
downloadnextcloud-server-56215513e1339c0c80bcaa67740768893e62b454.tar.gz
nextcloud-server-56215513e1339c0c80bcaa67740768893e62b454.zip
Merge pull request #25012 from owncloud/gdrive-fixfilesizewithmimetypemismatch
Fix GDrive file size when mime type doesn't match contents
Diffstat (limited to 'apps')
-rw-r--r--apps/files_external/lib/Lib/Storage/Google.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_external/lib/Lib/Storage/Google.php b/apps/files_external/lib/Lib/Storage/Google.php
index 49fde7d066f..96f12800c10 100644
--- a/apps/files_external/lib/Lib/Storage/Google.php
+++ b/apps/files_external/lib/Lib/Storage/Google.php
@@ -326,7 +326,7 @@ class Google extends \OC\Files\Storage\Common {
$stat['size'] = 0;
} else {
// Check if this is a Google Doc
- if ($this->getMimeType($path) !== $file->getMimeType()) {
+ if ($this->isGoogleDocFile($file)) {
// Return unknown file size
$stat['size'] = \OCP\Files\FileInfo::SPACE_UNKNOWN;
} else {