Merge pull request #18005 from nextcloud/fix/manual-app-instances
Remove some more direct app instance creations
This commit is contained in:
commit
7015501a74
|
@ -24,5 +24,5 @@ declare(strict_types=1);
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$app = new \OCA\AdminAudit\AppInfo\Application();
|
$app = \OC::$server->query(\OCA\AdminAudit\AppInfo\Application::class);
|
||||||
$app->register();
|
$app->register();
|
||||||
|
|
|
@ -33,7 +33,7 @@ OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php';
|
||||||
require_once __DIR__ . '/../3rdparty/autoload.php';
|
require_once __DIR__ . '/../3rdparty/autoload.php';
|
||||||
|
|
||||||
// register Application object singleton
|
// register Application object singleton
|
||||||
\OC_Mount_Config::$app = new \OCA\Files_External\AppInfo\Application();
|
\OC_Mount_Config::$app = \OC::$server->query(\OCA\Files_External\AppInfo\Application::class);
|
||||||
$appContainer = \OC_Mount_Config::$app->getContainer();
|
$appContainer = \OC_Mount_Config::$app->getContainer();
|
||||||
|
|
||||||
\OCA\Files\App::getNavigationManager()->add(function () {
|
\OCA\Files\App::getNavigationManager()->add(function () {
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
return new OCA\User_LDAP\GroupPluginManager();
|
return new OCA\User_LDAP\GroupPluginManager();
|
||||||
});
|
});
|
||||||
|
|
||||||
$app = new \OCA\User_LDAP\AppInfo\Application();
|
$app = \OC::$server->query(\OCA\User_LDAP\AppInfo\Application::class);
|
||||||
|
|
||||||
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
|
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
|
||||||
$configPrefixes = $helper->getServerConfigurationPrefixes(true);
|
$configPrefixes = $helper->getServerConfigurationPrefixes(true);
|
||||||
|
|
Loading…
Reference in New Issue