Merge pull request #23978 from nextcloud/enh/query_servercontainer_first
First query the server container
This commit is contained in:
commit
2f70a25076
|
@ -133,6 +133,12 @@ class ServerContainer extends SimpleContainer {
|
||||||
public function query(string $name, bool $autoload = true) {
|
public function query(string $name, bool $autoload = true) {
|
||||||
$name = $this->sanitizeName($name);
|
$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
|
// In case the service starts with OCA\ we try to find the service in
|
||||||
// the apps container first.
|
// the apps container first.
|
||||||
if (($appContainer = $this->getAppContainerForService($name)) !== null) {
|
if (($appContainer = $this->getAppContainerForService($name)) !== null) {
|
||||||
|
|
Loading…
Reference in New Issue