Merge pull request #32 from nextcloud/revert-25-downstream-160608

Revert "Downstream 2016-06-08"

1 files changed, 1 insertions, 15 deletions

diff --git a/apps/files_external/lib/Lib/Storage/Google.php b/apps/files_external/lib/Lib/Storage/Google.php
index 49fde7d066f..2a1ff768e2c 100644
--- a/apps/files_external/lib/Lib/Storage/Google.php
+++ b/apps/files_external/lib/Lib/Storage/Google.php
@@ -97,9 +97,6 @@ class Google extends \OC\Files\Storage\Common {
 	private function getDriveFile($path) {
 		// Remove leading and trailing slashes
 		$path = trim($path, '/');
-		if ($path === '.') {
-			$path = '';
-		}
 		if (isset($this->driveFiles[$path])) {
 			return $this->driveFiles[$path];
 		} else if ($path === '') {
@@ -141,7 +138,7 @@ class Google extends \OC\Files\Storage\Common {
 						if ($pos !== false) {
 							$pathWithoutExt = substr($path, 0, $pos);
 							$file = $this->getDriveFile($pathWithoutExt);
-							if ($file && $this->isGoogleDocFile($file)) {
+							if ($file) {
 								// Switch cached Google_Service_Drive_DriveFile to the correct index
 								unset($this->driveFiles[$pathWithoutExt]);
 								$this->driveFiles[$path] = $file;
@@ -211,17 +208,6 @@ class Google extends \OC\Files\Storage\Common {
 		}
 	}
 
-	/**
-	 * Returns whether the given drive file is a Google Doc file
-	 *
-	 * @param \Google_Service_Drive_DriveFile
-	 *
-	 * @return true if the file is a Google Doc file, false otherwise
-	 */
-	private function isGoogleDocFile($file) {
-		return $this->getGoogleDocExtension($file->getMimeType()) !== '';
-	}
-
 	public function mkdir($path) {
 		if (!$this->is_dir($path)) {
 			$parentFolder = $this->getDriveFile(dirname($path));