diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fc6387a..7a77fd15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ We will follow [Semantic Versioning](http://semver.org/). ## UNRELEASED ### Fixed +- Show warning on linking suggestions when the language cannot be retrieved from the content element, use the default language in case "All Languages" is selected - Show warning on linking suggestions when content element is set to "All Languages" instead of fatal exception - Added extra checks within the metatag generators in case fields do not exist (opengraph, twitter, robots) - `hasSitemapFields` now correctly returns the `sitemapFields` instead of `yoastSeoFields` diff --git a/Classes/Form/Element/InternalLinkingSuggestion.php b/Classes/Form/Element/InternalLinkingSuggestion.php index 7ef0d3ac..1c21cc70 100644 --- a/Classes/Form/Element/InternalLinkingSuggestion.php +++ b/Classes/Form/Element/InternalLinkingSuggestion.php @@ -102,6 +102,10 @@ protected function getLocale(int $pageId): ?string $siteFinder = GeneralUtility::makeInstance(SiteFinder::class); try { $site = $siteFinder->getSiteByPageId($pageId); + if ($this->languageId === -1) { + $this->languageId = $site->getDefaultLanguage()->getLanguageId(); + return $site->getDefaultLanguage()->getTwoLetterIsoCode(); + } return $site->getLanguageById($this->languageId)->getTwoLetterIsoCode(); } catch (SiteNotFoundException|\InvalidArgumentException $e) { return null; diff --git a/Resources/Private/Language/BackendModule.xlf b/Resources/Private/Language/BackendModule.xlf index 265e3c7e..975d4f90 100644 --- a/Resources/Private/Language/BackendModule.xlf +++ b/Resources/Private/Language/BackendModule.xlf @@ -197,7 +197,7 @@ Unable to determine linking suggestions. - This content element does not have a language to analyze. + There was a problem retrieving the language information for this content element, check your site configuration.