From: Lukas Reschke Date: Tue, 31 Mar 2015 13:30:49 +0000 (+0200) Subject: Only escape single quotes X-Git-Tag: v8.1.0alpha1~109^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c052ee75844bbd947e7466eda1f1dcda1ed43950;p=nextcloud-server.git Only escape single quotes --- diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index b9d3666f956..541113fb530 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -113,7 +113,7 @@ class Google extends \OC\Files\Storage\Common { if (isset($this->driveFiles[$path])) { $parentId = $this->driveFiles[$path]->getId(); } else { - $q = "title='" . rawurlencode($name) . "' and '" . rawurlencode($parentId) . "' in parents and trashed = false"; + $q = "title='" . str_replace("'","\\'", $name) . "' and '" . str_replace("'","\\'", $parentId) . "' in parents and trashed = false"; $result = $this->service->files->listFiles(array('q' => $q))->getItems(); if (!empty($result)) { // Google Drive allows files with the same name, ownCloud doesn't @@ -257,7 +257,7 @@ class Google extends \OC\Files\Storage\Common { if ($pageToken !== true) { $params['pageToken'] = $pageToken; } - $params['q'] = "'" . rawurlencode($folder->getId()) . "' in parents and trashed = false"; + $params['q'] = "'" . str_replace("'","\\'", $folder->getId()) . "' in parents and trashed = false"; $children = $this->service->files->listFiles($params); foreach ($children->getItems() as $child) { $name = $child->getTitle();