diff options
| -rw-r--r-- | apps/files_sharing/ajax/testremote.php | 3 | ||||
| -rw-r--r-- | apps/files_sharing/js/public.js | 2 | ||||
| -rw-r--r-- | apps/provisioning_api/lib/groups.php | 5 | ||||
| -rw-r--r-- | lib/private/appframework/dependencyinjection/dicontainer.php | 4 |
4 files changed, 5 insertions, 9 deletions
diff --git a/apps/files_sharing/ajax/testremote.php b/apps/files_sharing/ajax/testremote.php index 89581794698..08149bf7ecc 100644 --- a/apps/files_sharing/ajax/testremote.php +++ b/apps/files_sharing/ajax/testremote.php @@ -14,7 +14,8 @@ function testUrl($url) { try { $result = file_get_contents($url); $data = json_decode($result); - return is_object($data) and !empty($data->version); + // public link mount is only supported in ownCloud 7+ + return is_object($data) and !empty($data->version) and version_compare($data->version, '7.0.0', '>='); } catch (Exception $e) { return false; } diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 861da2065ea..02ecf56fa09 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -217,7 +217,7 @@ OCA.Sharing.PublicApp = { // this check needs to happen on the server due to the Content Security Policy directive $.get(OC.generateUrl('apps/files_sharing/testremote'), {remote: remote}).then(function (protocol) { if (protocol !== 'http' && protocol !== 'https') { - OC.dialogs.alert(t('files_sharing', 'No ownCloud installation found at {remote}', {remote: remote}), + OC.dialogs.alert(t('files_sharing', 'No ownCloud installation (7 or higher) found at {remote}', {remote: remote}), t('files_sharing', 'Invalid ownCloud url')); } else { OC.redirect(protocol + '://' + url); diff --git a/apps/provisioning_api/lib/groups.php b/apps/provisioning_api/lib/groups.php index ca714f7cc38..4440c5bf509 100644 --- a/apps/provisioning_api/lib/groups.php +++ b/apps/provisioning_api/lib/groups.php @@ -31,11 +31,6 @@ use \OC_SubAdmin; class Groups{ - public function setUp() { - // These seems to be deleted by another test. - OC_Group::createGroup('admin'); - } - /** * returns a list of groups */ diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php index 2c5089865a3..8d44d5fda87 100644 --- a/lib/private/appframework/dependencyinjection/dicontainer.php +++ b/lib/private/appframework/dependencyinjection/dicontainer.php @@ -201,7 +201,7 @@ class DIContainer extends SimpleContainer implements IAppContainer { }); $this->registerService('ServerContainer', function ($c) { - $c->query('OCP\\ILogger')->warning( + $c->query('OCP\\ILogger')->info( 'Accessing the server container is deprecated. Use type ' . 'annotations to inject core services instead!' ); @@ -222,7 +222,7 @@ class DIContainer extends SimpleContainer implements IAppContainer { * App Framework APIs */ $this->registerService('API', function($c){ - $c->query('OCP\\ILogger')->warning( + $c->query('OCP\\ILogger')->info( 'Accessing the API class is deprecated! Use the appropriate ' . 'services instead!' ); |