mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure we create an app's Application class just once 

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2019-10-11 08:21:24 +02:00
parent a373fd5848
commit f6a79338d4
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base.php
View File

@ -727,7 +727,7 @@ class OC {
// Make sure that the application class is not loaded before the database is setup // Make sure that the application class is not loaded before the database is setup
if ($systemConfig->getValue("installed", false)) { if ($systemConfig->getValue("installed", false)) {
OC_App::loadApp('settings'); OC_App::loadApp('settings');
$settings = new \OCA\Settings\AppInfo\Application(); $settings = \OC::$server->query(\OCA\Settings\AppInfo\Application::class);
$settings->register(); $settings->register();
} }

2
lib/private/Route/Router.php
View File

@ -371,7 +371,7 @@ class Router implements IRouter {
$applicationClassName = $appNameSpace . '\\AppInfo\\Application'; $applicationClassName = $appNameSpace . '\\AppInfo\\Application';
if (class_exists($applicationClassName)) { if (class_exists($applicationClassName)) {
$application = new $applicationClassName(); $application = \OC::$server->query($applicationClassName);
} else { } else {
$application = new App($appName); $application = new App($appName);
} }

3
lib/private/ServerContainer.php
View File

@ -100,8 +100,9 @@ class ServerContainer extends SimpleContainer {
if (!isset($this->hasNoAppContainer[$namespace])) { if (!isset($this->hasNoAppContainer[$namespace])) {
$applicationClassName = 'OCA\\' . $sensitiveNamespace . '\\AppInfo\\Application'; $applicationClassName = 'OCA\\' . $sensitiveNamespace . '\\AppInfo\\Application';
if (class_exists($applicationClassName)) { if (class_exists($applicationClassName)) {
new $applicationClassName(); $app = new $applicationClassName();
if (isset($this->appContainers[$namespace])) { if (isset($this->appContainers[$namespace])) {
$this->appContainers[$namespace]->offsetSet($applicationClassName, $app);
return $this->appContainers[$namespace]; return $this->appContainers[$namespace];
} }
} }