Fix url when using prefixDefaultLocale=true (#67)

wintercms · May 31, 2023 · 600c9ef · 600c9ef
1 parent df39163
commit 600c9ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/Plugin.php b/Plugin.php
@@ -380,6 +380,8 @@ function (DefinitionItem $item, array $itemInfo, Definition $definition, DOMDocu
                     }
                     foreach ($itemInfo['alternateLinks'] as $locale => $altUrl) {
                         if ($locale === $defaultLocale->code) {
+                            $loc = $urlElement->getElementsByTagName('loc')->item(0);
+                            $loc->nodeValue = $altUrl;
                             continue;
                         }
                         $newElement = $urlElement->cloneNode(true);

diff --git a/classes/MLPage.php b/classes/MLPage.php
@@ -27,14 +27,8 @@ public static function resolveMenuItem(object $item, string $url, Theme $theme):
 
             $alternateLinks = [];
             foreach ($locales as $locale => $name) {
-                if ($locale === $defaultLocale->code) {
-                    $pageUrl = $result['url'];
-                } else {
-                    $pageUrl = static::getLocalizedPageUrl($page, $locale);
-                }
-                if ($pageUrl) {
-                    $alternateLinks[$locale] = Url::to($pageUrl);
-                }
+                $pageUrl = static::getLocalizedPageUrl($page, $locale) ?: $result['url'];
+                $alternateLinks[$locale] = Url::to($pageUrl);
             }
 
             if ($alternateLinks) {