Localize the parent tag

Fetch the parent data from the current site/locale. Fixes #2991
statamic · Sep 21, 2021 · 3221798 · 3221798
1 parent ef63bf2
commit 3221798
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/Facades/Entry.php b/src/Facades/Entry.php
@@ -10,7 +10,7 @@
  * @method static \Statamic\Entries\EntryCollection whereCollection(string $handle)
  * @method static \Statamic\Entries\EntryCollection whereInCollection(array $handles)
  * @method static null|\Statamic\Contracts\Entries\Entry find($id)
- * @method static null|\Statamic\Contracts\Entries\Entry findByUri(string $uri)
+ * @method static null|\Statamic\Contracts\Entries\Entry findByUri(string $uri, string $site)
  * @method static \Statamic\Contracts\Entries\Entry make()
  * @method static \Statamic\Contracts\Entries\QueryBuilder query()
  * @method static void save($entry)

diff --git a/src/Tags/ParentTags.php b/src/Tags/ParentTags.php
@@ -3,6 +3,7 @@
 namespace Statamic\Tags;
 
 use Statamic\Facades\Entry;
+use Statamic\Facades\Site;
 use Statamic\Facades\URL;
 use Statamic\Support\Arr;
 use Stringy\StaticStringy as Stringy;
@@ -71,9 +72,7 @@ private function getParentUrl()
      */
     private function getParent()
     {
-        $crumbs = [];
-
-        $segments = explode('/', URL::getCurrent());
+        $segments = explode('/', URL::tidy(URL::removeSiteUrl(URL::getCurrent())));
         $segment_count = count($segments);
         $segments[0] = '/';
 
@@ -92,7 +91,7 @@ private function getParent()
 
         // Find the parent by stripping away URL segments
         foreach ($segment_urls as $segment_url) {
-            if ($content = Entry::findByUri($segment_url)) {
+            if ($content = Entry::findByUri($segment_url, Site::current())) {
                 return $content->toAugmentedArray();
             }
         }