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

[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

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