From d14adb2351911030bd9eff4311493dd63826c5ee Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 8 Mar 2016 18:04:24 +0100 Subject: [PATCH] Fix compatibility with PHP 5.4 Fixes https://github.com/owncloud/core/issues/22960 --- apps/files_external/lib/google.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index 3e8b60d33d..5e5716cf43 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());