From 68dacf2b5b198dac82f38b09617175b4087f9af1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 31 May 2016 16:32:29 +0200 Subject: owncloud: 9.0.2 --- owncloud-9.0.1-google-autoloader.patch | 37 ++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 owncloud-9.0.1-google-autoloader.patch (limited to 'owncloud-9.0.1-google-autoloader.patch') diff --git a/owncloud-9.0.1-google-autoloader.patch b/owncloud-9.0.1-google-autoloader.patch new file mode 100644 index 0000000..09f50e8 --- /dev/null +++ b/owncloud-9.0.1-google-autoloader.patch @@ -0,0 +1,37 @@ +diff --git a/apps/files_external/ajax/oauth2.php b/apps/files_external/ajax/oauth2.php +index b110cba..1367c7b 100644 +--- a/apps/files_external/ajax/oauth2.php ++++ b/apps/files_external/ajax/oauth2.php +@@ -26,9 +26,6 @@ + * along with this program. If not, see + * + */ +-set_include_path(get_include_path().PATH_SEPARATOR. +- \OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src'); +-require_once 'Google/Client.php'; + + OCP\JSON::checkAppEnabled('files_external'); + OCP\JSON::checkLoggedIn(); +diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php +index 62d264d..45b87c6 100644 +--- a/apps/files_external/lib/google.php ++++ b/apps/files_external/lib/google.php +@@ -37,10 +37,6 @@ use GuzzleHttp\Exception\RequestException; + use Icewind\Streams\IteratorDirectory; + 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'; + + class Google extends \OC\Files\Storage\Common { + +@@ -445,7 +441,6 @@ 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', + ]); + } catch (RequestException $e) { + if(!is_null($e->getResponse())) { -- cgit