Repository navigation
[6.x] Fix taxonomy index terms for multi-site and Blade - #15646
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes two problems with
$termson taxonomy index routes (e.g./tags):1. 500 on multisite with the Eloquent driver
Taxonomy::toResponse()passed the currentSiteobject towhere('site', ...). Stache casts it to a string when comparing, so it worked there. The Eloquent driver passes the value toTerm::in(), though, so theSiteobject ended up being used as a localization array key:$site->handle(), like every other term query in core.Site::selected()->handle()). It didn't crash, but only because it re-localizes the terms afterwards.Term::in()now accepts aSiteinstance and converts it to its handle, the same wayEntry::locale()already does. This covers other code that passes aSite, on any driver.2.
@foreach ($terms as $term)renders nothing in Blade$termswas a raw query builder. Query builders aren't iterable, so the Blade loop from the docs ran zero times.$terms(and the$tags-style alias) is now wrapped inStatamic\Fields\Value, which is already how query builders show up in augmented data, e.g.$entrieson term pages. Iterating aValueruns the query, and method calls are forwarded to the builder.