diff options
| author | Philipp Kapfer <philipp.kapfer@gmx.at> | 2013-05-25 17:10:20 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-03 16:30:48 +0200 |
| commit | 8ca897df76d2a93f66dbe097984eb1e8752410ce (patch) | |
| tree | 10a02fd2737909ff6742434f1c0c857fea0ce4bc /apps/files_external/appinfo | |
| parent | f7da4280ca1512a4a8224d28e3f6fd954c3b7205 (diff) | |
| download | nextcloud-server-8ca897df76d2a93f66dbe097984eb1e8752410ce.tar.gz nextcloud-server-8ca897df76d2a93f66dbe097984eb1e8752410ce.zip | |
Added cURL dependency check to Google Drive and WebDAV backend
Added check for backend's checkDependencies method to OC_Mount_Config::getBackends() when backend is configured to have some instead of blindly calling it and crashing
Conflicts:
apps/files_external/lib/config.php
apps/files_external/lib/google.php
Diffstat (limited to 'apps/files_external/appinfo')
| -rw-r--r-- | apps/files_external/appinfo/app.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php index d6238932cdb..39881b8455b 100644 --- a/apps/files_external/appinfo/app.php +++ b/apps/files_external/appinfo/app.php @@ -69,7 +69,8 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\Google', array( 'configured' => '#configured', 'token' => '#token', 'token_secret' => '#token secret'), - 'custom' => 'google')); + 'custom' => 'google', + 'has_dependencies' => true)); OC_Mount_Config::registerBackend('\OC\Files\Storage\SWIFT', array( 'backend' => 'OpenStack Swift', @@ -97,7 +98,8 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\DAV', array( 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', - 'secure' => '!Secure https://'))); + 'secure' => '!Secure https://'), + 'has_dependencies' => true)); OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP', array( 'backend' => 'SFTP', |