Skip to content

CMS home-page picker: list only ACTIVATED themes #325

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
WebTigers wants to merge 1 commit into
base: main
Choose a base branch
from
Open

CMS home-page picker: list only ACTIVATED themes #325

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
10 changes: 10 additions & 0 deletions modules/cms/services/Paths.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,16 @@ protected static function _discover(bool $advanced, string $q): array
$themes = [];
$themeHome = self::_t('cms.settings.theme_home');
$inv = Tiger_Theme::inventory();
// Only ACTIVATED themes belong in the picker — you can't serve a page from a theme that's turned
// off. A theme that ships as a MODULE (modules/theme-<key>) must have its module active; a plain
// themes/<name> theme has no module to deactivate, so it's always available.
$inactiveMods = [];
try { $inactiveMods = array_flip((new Tiger_Model_Module())->inactiveSlugs()); } catch (Throwable $e) {}
$themeActive = function ($key, $dir) use ($inactiveMods) {
return strpos((string) $dir, '/modules/theme-') === false || !isset($inactiveMods['theme-' . $key]);
};
foreach ($inv as $key => $t) {
if (!$themeActive($key, $t['dir'])) { continue; }
if (is_file($t['dir'] . '/content/index.phtml')) {
$label = $t['name'] . ' — ' . $themeHome;
$value = '@theme:' . $key;
Expand All @@ -128,6 +137,7 @@ protected static function _discover(bool $advanced, string $q): array
}
if ($advanced) {
foreach ($inv as $key => $t) {
if (!$themeActive($key, $t['dir'])) { continue; }
foreach (Tiger_Theme::pagesForKey($key) as $pg) {
if ($pg['slug'] === 'index') { continue; } // the home is already listed above
$label = $t['name'] . ' — ' . $pg['title'];
Expand Down
Loading