Merge pull request #59 from nextcloud/theming-app

Theming app

2 files changed, 21 insertions, 1 deletions

diff --git a/lib/private/Server.php b/lib/private/Server.php
index ab2e7b1fdf6..c663bc44261 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -78,6 +78,7 @@ use OC\Security\SecureRandom;
 use OC\Security\TrustedDomainHelper;
 use OC\Session\CryptoWrapper;
 use OC\Tagging\TagMapper;
+use OCA\Theming\Template;
 use OCP\IL10N;
 use OCP\IServerContainer;
 use OCP\Security\IContentSecurityPolicyManager;
@@ -618,6 +619,17 @@ class Server extends ServerContainer implements IServerContainer {
 			$factory = new $factoryClass($this);
 			return $factory->getManager();
 		});
+		$this->registerService('ThemingDefaults', function(Server $c) {
+			if($this->getConfig()->getSystemValue('installed', false) && $this->getAppManager()->isInstalled('theming')) {
+				return new Template(
+					$this->getConfig(),
+					$this->getL10N('theming'),
+					$this->getURLGenerator(),
+					new \OC_Defaults()
+				);
+			}
+			return new \OC_Defaults();
+		});
 		$this->registerService('EventDispatcher', function () {
 			return new EventDispatcher();
 		});
@@ -1290,6 +1302,14 @@ class Server extends ServerContainer implements IServerContainer {
 	}
 
 	/**
+	 * @internal Not public by intention.
+	 * @return \OC_Defaults
+	 */
+	public function getThemingDefaults() {
+		return $this->query('ThemingDefaults');
+	}
+
+	/**
 	 * @return \OC\IntegrityCheck\Checker
 	 */
 	public function getIntegrityCodeChecker() {
diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php
index 5023e3a60c8..e2956508090 100644
--- a/lib/private/legacy/template.php
+++ b/lib/private/legacy/template.php
@@ -80,7 +80,7 @@ class OC_Template extends \OC\Template\Base {
 
 		$parts = explode('/', $app); // fix translation when app is something like core/lostpassword
 		$l10n = \OC::$server->getL10N($parts[0]);
-		$themeDefaults = new OC_Defaults();
+		$themeDefaults = \OC::$server->getThemingDefaults();
 
 		list($path, $template) = $this->findTemplate($theme, $app, $name);