diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-11-09 10:58:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 10:58:26 +0100 |
| commit | 2f70a2507664897b1766a3bd915da1500fc59bfe (patch) | |
| tree | 4a151dc53ca7d0ea545cde13827ce9ac9fec31e2 | |
| parent | 46002a46a6fdd08bdb1eca1f70184dacb8d7cd07 (diff) | |
| parent | 889bb44b425417c3a63a269b060a7bc7e112bc38 (diff) | |
| download | nextcloud-server-2f70a2507664897b1766a3bd915da1500fc59bfe.tar.gz nextcloud-server-2f70a2507664897b1766a3bd915da1500fc59bfe.zip | |
Merge pull request #23978 from nextcloud/enh/query_servercontainer_first
First query the server container
| -rw-r--r-- | lib/private/ServerContainer.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/private/ServerContainer.php b/lib/private/ServerContainer.php index 72275ac1205..50592f36ada 100644 --- a/lib/private/ServerContainer.php +++ b/lib/private/ServerContainer.php @@ -133,6 +133,12 @@ class ServerContainer extends SimpleContainer { public function query(string $name, bool $autoload = true) { $name = $this->sanitizeName($name); + try { + return parent::query($name, false); + } catch (QueryException $e) { + // Continue with general autoloading then + } + // In case the service starts with OCA\ we try to find the service in // the apps container first. if (($appContainer = $this->getAppContainerForService($name)) !== null) { |