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.0.1-google-autoloader.patch | |
| parent | 808452fe81fbf96dfee7bd8082cab457cca5d780 (diff) | |
owncloud: 9.1.1 (backported from Fedora, thanks James)
Diffstat (limited to 'owncloud-9.0.1-google-autoloader.patch')
| -rw-r--r-- | owncloud-9.0.1-google-autoloader.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/owncloud-9.0.1-google-autoloader.patch b/owncloud-9.0.1-google-autoloader.patch deleted file mode 100644 index 09f50e8..0000000 --- a/owncloud-9.0.1-google-autoloader.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 <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/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())) { |