diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-18 10:14:01 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-18 10:14:01 +0100 |
| commit | bfd4a9548b014c790b683a4c0384750db73c4a87 (patch) | |
| tree | 290e708d760cdb31101292f85e636a559170360a | |
| parent | a345c49d12e69ae4825f06d635a9f6764cb477d5 (diff) | |
| parent | d38b71f20602268856c7cd2ce5c773ed4f41d64b (diff) | |
| download | nextcloud-server-bfd4a9548b014c790b683a4c0384750db73c4a87.tar.gz nextcloud-server-bfd4a9548b014c790b683a4c0384750db73c4a87.zip | |
Merge pull request #22408 from owncloud/gdrive-remove-mimetype-detection
Fix GDrive mime type detection with encryption
| -rw-r--r-- | apps/files_external/lib/google.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index 8a9ffaf7d37..f496fc77574 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -520,7 +520,8 @@ class Google extends \OC\Files\Storage\Common { // Download as .odp is not available return 'application/pdf'; } else { - return $mimetype; + // use extension-based detection, could be an encrypted file + return parent::getMimeType($path); } } else { return false; |