From 713786bdb89b973926c273c7a2e68bb346d02c7e Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 11 Jun 2024 09:41:45 +1200 Subject: [PATCH 1/2] FIX Preview link when no locale set --- src/Extension/FluentExtension.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Extension/FluentExtension.php b/src/Extension/FluentExtension.php index 6980ee57..3edd2ced 100644 --- a/src/Extension/FluentExtension.php +++ b/src/Extension/FluentExtension.php @@ -1160,8 +1160,11 @@ public function updateFluentCMSField(FormField $field) public function updatePreviewLink(&$link): void { $owner = $this->owner; - $info = $owner->LocaleInformation(FluentState::singleton()->getLocale()); - + $locale = FluentState::singleton()->getLocale(); + if ($locale === null || $locale === '') { + return; + } + $info = $owner->LocaleInformation($locale); if (!$info->getSourceLocale()) { $link = null; } From 201826ed8225873fc11e57efc0004b65b1df3ec7 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 11 Jun 2024 11:32:25 +1200 Subject: [PATCH 2/2] ENH Revert temporary locale fix --- src/Extension/FluentExtension.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/Extension/FluentExtension.php b/src/Extension/FluentExtension.php index 3edd2ced..c0f0fe3f 100644 --- a/src/Extension/FluentExtension.php +++ b/src/Extension/FluentExtension.php @@ -1056,15 +1056,6 @@ public function LocaleInformation($locale = null) $localeObj = Locale::getDefault(); } - if (!$localeObj) { - // There is no default locale, this can happen if no locales have been setup - // This will happen when doing integration unit testing, though can also happen during regular - // website operation - // This temporary Locale is created to prevent a invalid argument exception in - // RecordLocale::__construct() - $localeObj = Locale::create(['Locale' => i18n::get_locale()]); - } - return RecordLocale::create($this->owner, $localeObj); }