Upgrade to 3.8.3
This commit is contained in:
@@ -138,7 +138,10 @@ abstract class Model
|
||||
default => [38, 76]
|
||||
};
|
||||
|
||||
if (($settings['cover'] ?? false) === false || $layout === 'cards') {
|
||||
if (
|
||||
($settings['cover'] ?? false) === false ||
|
||||
$layout === 'cards'
|
||||
) {
|
||||
$settings['srcset'] = $image->srcset($sizes);
|
||||
} else {
|
||||
$settings['srcset'] = $image->srcset([
|
||||
|
@@ -522,13 +522,10 @@ class Panel
|
||||
{
|
||||
$kirby = App::instance();
|
||||
|
||||
if ($user = $kirby->user()) {
|
||||
// use the user language for the default translation
|
||||
$translation = $user->language();
|
||||
} else {
|
||||
// fall back to the language from the config
|
||||
$translation = $kirby->panelLanguage();
|
||||
}
|
||||
// use the user language for the default translation or
|
||||
// fall back to the language from the config
|
||||
$translation = $kirby->user()?->language() ??
|
||||
$kirby->panelLanguage();
|
||||
|
||||
$kirby->setCurrentTranslation($translation);
|
||||
|
||||
|
Reference in New Issue
Block a user