diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-10-07 13:24:37 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-10-07 13:24:37 +0200 |
| commit | dd2519b150dfbb1415677e4b78d1aef4ea80cf45 (patch) | |
| tree | 220fba0651dffb97f92fb29b37c206b8bcbba35f /owncloud-9.1.0-google-autoloader.patch | |
| parent | 808452fe81fbf96dfee7bd8082cab457cca5d780 (diff) | |
owncloud: 9.1.1 (backported from Fedora, thanks James)
Diffstat (limited to 'owncloud-9.1.0-google-autoloader.patch')
| -rw-r--r-- | owncloud-9.1.0-google-autoloader.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/owncloud-9.1.0-google-autoloader.patch b/owncloud-9.1.0-google-autoloader.patch new file mode 100644 index 0000000..db2ad48 --- /dev/null +++ b/owncloud-9.1.0-google-autoloader.patch @@ -0,0 +1,37 @@ +diff --git a/apps/files_external/ajax/oauth2.php b/apps/files_external/ajax/oauth2.php +index 2d1fae2..d8dac91 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 <http://www.gnu.org/licenses/> + * + */ +-set_include_path(get_include_path().PATH_SEPARATOR. +- \OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src'); +-require_once 'Google/autoload.php'; + + OCP\JSON::checkAppEnabled('files_external'); + OCP\JSON::checkLoggedIn(); +diff --git a/apps/files_external/lib/Lib/Storage/Google.php b/apps/files_external/lib/Lib/Storage/Google.php +index 0b617aa..d40ac36 100644 +--- a/apps/files_external/lib/Lib/Storage/Google.php ++++ b/apps/files_external/lib/Lib/Storage/Google.php +@@ -38,10 +38,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/autoload.php'; +- + class Google extends \OC\Files\Storage\Common { + + private $client; +@@ -462,7 +458,6 @@ class Google extends \OC\Files\Storage\Common { + $response = $client->get($downloadUrl, [ + 'headers' => $httpRequest->getRequestHeaders(), + 'stream' => true, +- 'verify' => realpath(__DIR__ . '/../../../3rdparty/google-api-php-client/src/Google/IO/cacerts.pem'), + ]); + } catch (RequestException $e) { + if(!is_null($e->getResponse())) { |