diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2016-08-15 20:22:48 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-08-15 20:37:19 +0200 |
| commit | c044aa34fa06ecef90dde2f6793e5e4d77f5200b (patch) | |
| tree | c4badcdd7be65e3de64c6597b05ad9de16a78b11 /lib/private/Server.php | |
| parent | 396678c9ce98c901384c827e3a45173cf6c8c5bb (diff) | |
| download | nextcloud-server-c044aa34fa06ecef90dde2f6793e5e4d77f5200b.tar.gz nextcloud-server-c044aa34fa06ecef90dde2f6793e5e4d77f5200b.zip | |
Make the capabilities manager more error proof
If an app registers an invalid capabilty we should not crash hard.
Instead we should catch the exception. Log it (error) and carry on.
* Added tests
Diffstat (limited to 'lib/private/Server.php')
| -rw-r--r-- | lib/private/Server.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php index d5808d7f17c..03c3633c9f2 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -629,7 +629,7 @@ class Server extends ServerContainer implements IServerContainer { return new Manager(); }); $this->registerService('CapabilitiesManager', function (Server $c) { - $manager = new \OC\CapabilitiesManager(); + $manager = new \OC\CapabilitiesManager($c->getLogger()); $manager->registerCapability(function () use ($c) { return new \OC\OCS\CoreCapabilities($c->getConfig()); }); |