fix(theming): enforce theme also for login

susnux · susnux · commit d60d72d80888 · 2025-03-27T11:11:59.000+01:00
Signed-off-by: Ferdinand Thiessen &lt;opensource@fthiessen.de&gt;
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
@@ -25,7 +25,9 @@
 		<?php emit_script_loading_tags($_); ?>
 		<?php print_unescaped($_['headers']); ?>
 	</head>
-	<body id="<?php p($_['bodyid']);?>">
+	<body id="<?php p($_['bodyid']);?>" <?php foreach ($_['enabledThemes'] as $themeId) {
+		p("data-theme-$themeId ");
+	}?> data-themes="<?php p(join(',', $_['enabledThemes'])) ?>">
 		<?php include 'layout.noscript.warning.php'; ?>
 		<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
 			<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
@@ -183,6 +183,8 @@ public function __construct($renderAs, $appId = '') {
 			if ($user) {
 				$userDisplayName = $user->getDisplayName();
 			}
+			$theme = $this->config->getSystemValueString('enforce_theme', '');
+			$this->assign('enabledThemes', $theme === '' ? [] : [$theme]);
 			$this->assign('user_displayname', $userDisplayName);
 			$this->assign('user_uid', \OC_User::getUser());
 		} elseif ($renderAs === TemplateResponse::RENDER_AS_PUBLIC) {

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,8 @@ public function __construct($renderAs, $appId = '') {`
`183`	`183`	`if ($user) {`
`184`	`184`	`$userDisplayName = $user->getDisplayName();`
`185`	`185`	`}`
	`186`	`+ $theme = $this->config->getSystemValueString('enforce_theme', '');`
	`187`	`+ $this->assign('enabledThemes', $theme === '' ? [] : [$theme]);`
`186`	`188`	`$this->assign('user_displayname', $userDisplayName);`
`187`	`189`	`$this->assign('user_uid', \OC_User::getUser());`
`188`	`190`	`} elseif ($renderAs === TemplateResponse::RENDER_AS_PUBLIC) {`