diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-09 12:20:42 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-09 12:20:42 +0100 |
| commit | 447e8d2313123b28323af70d357abd407a94f716 (patch) | |
| tree | faa756ee49ad85130513803993f06534f9e2e588 /apps/files_external | |
| parent | 30cec687ae788fcabe901c3302b260563822fa56 (diff) | |
| parent | d14adb2351911030bd9eff4311493dd63826c5ee (diff) | |
| download | nextcloud-server-447e8d2313123b28323af70d357abd407a94f716.tar.gz nextcloud-server-447e8d2313123b28323af70d357abd407a94f716.zip | |
Merge pull request #22961 from owncloud/fix-gdrive-on-php54
Fix compatibility with PHP 5.4
Diffstat (limited to 'apps/files_external')
| -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 3e8b60d33df..5e5716cf438 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -265,7 +265,8 @@ class Google extends \OC\Files\Storage\Common { foreach ($children->getItems() as $child) { $name = $child->getTitle(); // Check if this is a Google Doc i.e. no extension in name - if (empty($child->getFileExtension()) + $extension = $child->getFileExtension(); + if (empty($extension) && $child->getMimeType() !== self::FOLDER ) { $name .= '.'.$this->getGoogleDocExtension($child->getMimeType()); |