Merge pull request #60481 from nextcloud/jtr/legacy-getTheme

refactor(legacy): simplify getTheme and clarify legacy theme docs
2026-06-09 00:32:29 -04:00 · 2026-06-04 15:57:52 +02:00 · 2026-06-04 15:57:52 +02:00 · d4c8781e82
commit d4c8781e82
parent 232fb616ea 965b6a96e4
1 changed files with 14 additions and 9 deletions
--- a/lib/private/legacy/OC_Util.php
+++ b/lib/private/legacy/OC_Util.php
@ -614,21 +614,26 @@ class OC_Util {
 	}

 	/**
-	 * Handles the case that there may not be a theme, then check if a "default"
-	 * theme exists and take that one
+	 * Returns the name of the active legacy theme.
 	 *
-	 * @return string the theme
+	 * This method does not verify that the configured theme directory exists. It
+	 * only applies to the legacy filesystem-based theme mechanism, not the modern
+	 * theming app.
+	 *
+	 * @return string The configured legacy theme name, `default` as a fallback if present, or an empty string if there is no active legacy theme.
 	 */
 	public static function getTheme() {
-		$theme = Server::get(SystemConfig::class)->getValue('theme', '');
+		$themeName = Server::get(SystemConfig::class)->getValue('theme', '');

-		if ($theme === '') {
-			if (is_dir(OC::$SERVERROOT . '/themes/default')) {
-				$theme = 'default';
-			}
+		if ($themeName !== '') {
+			return $themeName;
 		}

-		return $theme;
+		if (is_dir(OC::$SERVERROOT . '/themes/default')) {
+			return 'default';
+		}
+
+		return '';
 	}

 	/**