Skip to content

[3.0] Offer the default variant wherever the variant list is built #9668

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
albertlast wants to merge 1 commit into
base: release-3.0
Choose a base branch
from
+8 −0
Open

[3.0] Offer the default variant wherever the variant list is built #9668

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions Sources/Actions/Admin/Themes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,6 +884,10 @@ public function setSettings(): void
if (!empty(Theme::$current->settings['theme_variants'])) {
Utils::$context['theme_variants'] = [];

// Theme::loadVariant() offers a variant named 'default' alongside
// whatever the theme declares, so it belongs in this list too.
Theme::$current->settings['theme_variants'] = array_unique(array_merge(['default'], Theme::$current->settings['theme_variants']));

foreach (Theme::$current->settings['theme_variants'] as $variant) {
// Have any text, old chap?
Utils::$context['theme_variants'][$variant] = [
Expand Down
4 changes: 4 additions & 0 deletions Sources/Actions/ThemeChooser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,10 @@ public function execute(): void
eval(($matches[1] === '$' ? 'global $settings; ' : 'use SMF\\Theme; ') . $matches[0]);

if (!empty(Theme::$current->settings['theme_variants'])) {
// Theme::loadVariant() offers a variant named 'default' alongside
// whatever the theme declares, so it belongs in this list too.
Theme::$current->settings['theme_variants'] = array_unique(array_merge(['default'], Theme::$current->settings['theme_variants']));

foreach (Theme::$current->settings['theme_variants'] as $variant) {
Utils::$context['available_themes'][$id_theme]['variants'][$variant] = [
'label' => Lang::txtExists('variant_' . $variant) ? Lang::getTxt('variant_' . $variant) : $variant,
Expand Down