diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-05-24 14:46:10 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-05-24 14:46:10 +0200 |
| commit | f7d102ccc59c8290d7e1caedb9862764bd831eaf (patch) | |
| tree | 850b2326b8648418fb89494407c0358fe19fd467 /apps/files_external/lib | |
| parent | 648fc8d916022dd0538c02fb5f46188e2f60da92 (diff) | |
| parent | 8a40003169170038b56f14fb1a3082c192c8d0c4 (diff) | |
| download | nextcloud-server-f7d102ccc59c8290d7e1caedb9862764bd831eaf.tar.gz nextcloud-server-f7d102ccc59c8290d7e1caedb9862764bd831eaf.zip | |
Merge pull request #24799 from owncloud/altyr-117-upstream
Update google-api-php-client to 1.1.7
Diffstat (limited to 'apps/files_external/lib')
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/Google.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/files_external/lib/Lib/Storage/Google.php b/apps/files_external/lib/Lib/Storage/Google.php index 9e5409e226e..7e014b0a44c 100644 --- a/apps/files_external/lib/Lib/Storage/Google.php +++ b/apps/files_external/lib/Lib/Storage/Google.php @@ -39,8 +39,7 @@ use Icewind\Streams\RetryWrapper; set_include_path(get_include_path().PATH_SEPARATOR. \OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src'); -require_once 'Google/Client.php'; -require_once 'Google/Service/Drive.php'; +require_once 'Google/autoload.php'; class Google extends \OC\Files\Storage\Common { @@ -159,7 +158,7 @@ class Google extends \OC\Files\Storage\Common { /** * Set the Google_Service_Drive_DriveFile object in the cache * @param string $path - * @param Google_Service_Drive_DriveFile|false $file + * @param \Google_Service_Drive_DriveFile|false $file */ private function setDriveFile($path, $file) { $path = trim($path, '/'); @@ -448,7 +447,7 @@ class Google extends \OC\Files\Storage\Common { $response = $client->get($downloadUrl, [ 'headers' => $httpRequest->getRequestHeaders(), 'stream' => true, - 'verify' => __DIR__ . '/../../3rdparty/google-api-php-client/src/Google/IO/cacerts.pem', + 'verify' => realpath(__DIR__ . '/../../../3rdparty/google-api-php-client/src/Google/IO/cacerts.pem'), ]); } catch (RequestException $e) { if(!is_null($e->getResponse())) { |