Skip to content

refactor(legacy): simplify getTheme and clarify legacy theme docs #60481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshtrichards wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −9
Open

refactor(legacy): simplify getTheme and clarify legacy theme docs #60481

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions lib/private/legacy/OC_Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,21 +614,26 @@ public static function obEnd() {
}

/**
* 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;
}

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

return $theme;
return '';
}

/**
Expand Down
Loading