Merge pull request #22961 from owncloud/fix-gdrive-on-php54

Fix compatibility with PHP 5.4
2016-03-09 12:20:42 +07:00 · 2016-03-09 12:20:42 +07:00 · 447e8d2313
parent 30cec687ae d14adb2351
commit 447e8d2313
1 changed files with 2 additions and 1 deletions
--- 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());