diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php index cb018d763c1fe..5d64cb5ea82da 100644 --- a/administrator/templates/atum/error_full.php +++ b/administrator/templates/atum/error_full.php @@ -89,14 +89,18 @@ $themeModeAttr = $themeModes[$userColorScheme]; } else { // Check parameters first (User and Template), then look if we have detected the OS color scheme (if it set to 'os') - $colorScheme = $app->getIdentity()->getParam('colorScheme', $colorScheme); + $colorScheme = $app->getIdentity()?->getParam('colorScheme', $colorScheme) ?? 'os'; $osColorScheme = $colorScheme === 'os' ? $app->getInput()->cookie->get('osColorScheme', '') : ''; $themeModeAttr = ($themeModes[$colorScheme] ?? '') . ($themeModes[$osColorScheme] ?? ''); } } -// @see administrator/templates/atum/html/layouts/status.php - $statusModules = LayoutHelper::render('status', ['modules' => 'status']); + // The module renderer will not work properly due to incomplete Application initialisation + $renderModules = $app->getIdentity() && $app->getLanguage(); + + // @see administrator/templates/atum/html/layouts/status.php + $statusModules = $renderModules ? LayoutHelper::render('status', ['modules' => 'status']) : ''; + ?> > @@ -122,9 +126,13 @@ 'logo-collapsed', 'loading' => 'eager', 'decoding' => 'async'], false, 0); ?> - + + + - + + +
@@ -137,14 +145,18 @@
- + + +
- + + +

@@ -179,14 +191,14 @@

- countModules('bottom')) : ?> + countModules('bottom')) : ?>
- + @@ -204,6 +216,8 @@ - + + + diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php index 1ad144b9d5ad3..58bffd8ebf139 100644 --- a/administrator/templates/atum/error_login.php +++ b/administrator/templates/atum/error_login.php @@ -93,14 +93,17 @@ $themeModeAttr = $themeModes[$userLastMode]; } else { // Check parameters first (User and Template), then look if we have detected the OS color scheme (if it set to 'os') - $colorScheme = $app->getIdentity()->getParam('colorScheme', $colorScheme); + $colorScheme = $app->getIdentity()?->getParam('colorScheme', $colorScheme) ?? 'os'; $lastMode = $colorScheme === 'os' ? $app->getInput()->cookie->get('osColorScheme', '') : ''; $themeModeAttr = ($colorScheme === 'os' ? $themeModes['os'] : '') . ($themeModes[$lastMode] ?? ''); } } +// The module renderer will not work properly due to incomplete Application initialisation +$renderModules = $app->getIdentity() && $app->getLanguage(); + // @see administrator/templates/atum/html/layouts/status.php -$statusModules = LayoutHelper::render('status', ['modules' => 'status']); +$statusModules = $renderModules ? LayoutHelper::render('status', ['modules' => 'status']) : ''; ?> > @@ -126,7 +129,9 @@ 'logo-collapsed', 'loading' => 'eager', 'decoding' => 'async'], false, 0); ?> - + + + @@ -178,10 +183,14 @@ - + + + diff --git a/libraries/src/WebAsset/AssetItem/LangActiveAssetItem.php b/libraries/src/WebAsset/AssetItem/LangActiveAssetItem.php index 42e2934f60f3b..5c80be3c91388 100644 --- a/libraries/src/WebAsset/AssetItem/LangActiveAssetItem.php +++ b/libraries/src/WebAsset/AssetItem/LangActiveAssetItem.php @@ -45,9 +45,13 @@ public function __construct( parent::__construct($name, $uri, $options, $attributes, $dependencies); // Prepare Uri depend from the active language - $langTag = Factory::getApplication()->getLanguage()->getTag(); + $langTag = Factory::getApplication()->getLanguage()?->getTag(); $client = $this->getOption('client'); + if (!$langTag) { + return; + } + // Create Uri /language//.css if ($client) { $this->uri = $client . '/language/' . $langTag . '/' . $langTag . '.css'; diff --git a/templates/cassiopeia/error.php b/templates/cassiopeia/error.php index 8a4000afda9cc..4afadf8bb9e4d 100644 --- a/templates/cassiopeia/error.php +++ b/templates/cassiopeia/error.php @@ -101,6 +101,9 @@ // Get the error code $errorCode = $this->error->getCode(); + +// The module renderer will not work properly due to incomplete Application initialisation +$renderModules = $app->getIdentity() && $app->getLanguage(); ?> @@ -132,7 +135,7 @@ - countModules('menu') || $this->countModules('search')) : ?> + countModules('menu') || $this->countModules('search'))) : ?>
countModules('menu')) : ?> @@ -148,7 +151,7 @@
- countModules('error-' . $errorCode)) : ?> + countModules('error-' . $errorCode)) : ?>
@@ -202,7 +205,7 @@
- countModules('footer')) : ?> + countModules('footer')) : ?>
@@ -210,6 +213,8 @@
- + + +