From 246affb1a057dc11ba6af6bcd08fbf5c53393e01 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 19 Jan 2017 16:55:09 +0100
Subject: [PATCH] Use correct theming when returning the defaults
Signed-off-by: Joas Schilling <coding@schilljs.com>
---
core/Application.php | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/core/Application.php b/core/Application.php
index dad7546dcb8..6621964c289 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -30,7 +30,9 @@
namespace OC\Core;
+use OC\Core\Controller\OCJSController;
use OC\Security\IdentityProof\Manager;
+use OC\Server;
use OCP\AppFramework\App;
use OC\Core\Controller\CssController;
use OCP\AppFramework\Utility\ITimeFactory;
@@ -66,5 +68,24 @@ class Application extends App {
$container->query(ITimeFactory::class)
);
});
+ $container->registerService(OCJSController::class, function () use ($container) {
+ /** @var Server $server */
+ $server = $container->getServer();
+ return new OCJSController(
+ $container->query('appName'),
+ $server->getRequest(),
+ $server->getL10N('core'),
+ // This is required for the theming to overwrite the `OC_Defaults`, see
+ // https://github.com/nextcloud/server/issues/3148
+ $server->getThemingDefaults(),
+ $server->getAppManager(),
+ $server->getSession(),
+ $server->getUserSession(),
+ $server->getConfig(),
+ $server->getGroupManager(),
+ $server->getIniWrapper(),
+ $server->getURLGenerator()
+ );
+ });
}
}
--
GitLab