Merge branch 'release/1.4.3'

pecotamic · May 17, 2023 · 45bf7cc · 45bf7cc
2 parents e660717 + cd56687
commit 45bf7cc
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/Generator.php b/src/Generator.php
@@ -36,7 +36,7 @@ public function entries(): array
         }
 
         // filter by current site
-        $entries = $entries->filter(self::siteFilter(Site::current()->handle()));
+        $entries = $entries->filter(self::siteFilter(Site::current()));
 
         // filter by config
         if ($excludedUrls = config('pecotamic.sitemap.exclude_urls')) {
@@ -151,10 +151,11 @@ protected function publishedCollectionTerms()
             });
     }
 
-    protected static function siteFilter($currentSite): callable
+    protected static function siteFilter(\Statamic\Sites\Site $currentSite): callable
     {
-        return static function ($entry) use ($currentSite) {
-            return $entry->locale() === $currentSite;
+        return static function (\Statamic\Entries\Entry $entry) use ($currentSite) {
+            return $entry->redirectUrl() === null
+                && $entry->locale() === $currentSite->lang();
         };
     }