diff options
| author | Joas Schilling <coding@schilljs.com> | 2019-03-05 17:55:35 +0100 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2019-03-05 17:55:35 +0100 |
| commit | c5ab74348c01593e3f0c3a05701b224b019ecd87 (patch) | |
| tree | 8c960cbbcd6edf4bf675461fdef19438a19cd009 /lib/public | |
| parent | a4b34abe45ec407524f2c12beec9af6eaa103afe (diff) | |
| download | nextcloud-server-c5ab74348c01593e3f0c3a05701b224b019ecd87.tar.gz nextcloud-server-c5ab74348c01593e3f0c3a05701b224b019ecd87.zip | |
Avoid duplicate App container creation
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/AppFramework/App.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/public/AppFramework/App.php b/lib/public/AppFramework/App.php index b6ed2da5076..06524e4bf02 100644 --- a/lib/public/AppFramework/App.php +++ b/lib/public/AppFramework/App.php @@ -66,11 +66,16 @@ class App { /** + * @param string $appName * @param array $urlParams an array with variables extracted from the routes * @since 6.0.0 */ public function __construct(string $appName, array $urlParams = []) { - $this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName, $urlParams); + try { + $this->container = \OC::$server->getRegisteredAppContainer($appName); + } catch (QueryException $e) { + $this->container = new \OC\AppFramework\DependencyInjection\DIContainer($appName, $urlParams); + } } /** |