Make sure the links are directed to the active store

if locale fallback is enabled the current store should resolve those
links locally

Author: JeroenBoersma

ViewModel/LinkResolver.php

@@ -281,6 +281,14 @@ private function getLanguageStoreIds(): array
             $languageStoreIds[$languageCode] = $languageStoreIds[$languageCode] ?? +$store->getId();
         }
 
+        /**
+         * If locale fallback is enabled, make sure those requests will be directed to this store
+         */
+        $currentStore = $this->storeManager->getStore();
+        if ($this->configuration->hasContentLanguageFallback($this->storeManager->getStore())) {
+            $languageStoreIds[$this->configuration->getContentLanguageFallback($currentStore)] = +$currentStore->getId();
+        }
+
         $this->cachedLanguageStoreIds = $languageStoreIds;
         return $languageStoreIds;
     }