upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 00:02:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Merge pull request #22965 from owncloud/stable9-fix-gdrive

Browse source 
[stable9] Fix compatibility with PHP 5.4
This commit is contained in:
Thomas Müller 2016-03-09 12:20:24 +01:00
commit 734b3e1408
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/files_external/lib/google.php
View file

@ -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());