diff --git a/src/Taxonomies/LocalizedTerm.php b/src/Taxonomies/LocalizedTerm.php index 58c4cf72e4..6dabf126f1 100644 --- a/src/Taxonomies/LocalizedTerm.php +++ b/src/Taxonomies/LocalizedTerm.php @@ -347,7 +347,7 @@ public function route() { $taxonomySlug = Str::replace('_', '-', $this->taxonomyHandle()); - if (! $this->taxonomy()->isAssignedToCollection()) { + if ($this->collection() && ! $this->taxonomy()->isAssignedToCollection()) { return URL::tidy("/{$taxonomySlug}/{slug}"); } diff --git a/src/Taxonomies/Taxonomy.php b/src/Taxonomies/Taxonomy.php index 869857f2c8..ad1f04b4ce 100644 --- a/src/Taxonomies/Taxonomy.php +++ b/src/Taxonomies/Taxonomy.php @@ -342,7 +342,7 @@ public function uri() { $taxonomySlug = Str::replace('_', '-', $this->handle); - if (! $this->isAssignedToCollection()) { + if ($this->collection() && ! $this->isAssignedToCollection()) { return URL::tidy("/{$taxonomySlug}"); } @@ -369,7 +369,7 @@ public function collections() public function isAssignedToCollection() { - return $this->collection() && $this->collections()->contains($this->collection()); + return $this->collections()->contains($this->collection()); } public function toResponse($request)