From 7917ae7c23837aa53b331b31e96e9c5f8b474fe2 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 | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/core/Application.php b/core/Application.php
index 545b5fe420b6d..76da908efbf57 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -30,10 +30,10 @@
 
 namespace OC\Core;
 
-use OC\AppFramework\Utility\SimpleContainer;
+use OC\Core\Controller\OCJSController;
 use OC\Security\IdentityProof\Manager;
+use OC\Server;
 use OCP\AppFramework\App;
-use OCP\Files\IAppData;
 use OCP\Util;
 
 /**
@@ -57,5 +57,25 @@ public function __construct() {
 				\OC::$server->getCrypto()
 			);
 		});
+
+		$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()
+			);
+		});
 	}
 }