github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-03-28 18:25:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: tag state loaded for wrong user (#4009)

Browse Source
This commit is contained in:
Rafał Całka 2024-09-20 09:30:45 +02:00 committed by GitHub
parent aafc615d67
commit e1a77fd7c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/tags/src/Tag.php
View File

@ -43,7 +43,7 @@ use Illuminate\Database\Query\Builder as QueryBuilder;
* @property int $last_posted_user_id
* @property string $icon
*
* @property TagState $state
* @property TagState|null $state
* @property Tag|null $parent
* @property-read Collection<int, Tag> $children
* @property-read Collection<int, Discussion> $discussions
@ -166,7 +166,16 @@ class Tag extends AbstractModel
*/
public function stateFor(User $user): TagState
{
$state = $this->state()->where('user_id', $user->id)->first();
// Use the loaded state if the relation is loaded, and either:
// 1. The state is null, or
// 2. The state belongs to the given user.
// This ensures that if a non-null state is loaded, it belongs to the correct user.
// If these conditions are not met, we query the database for the user's state.
if ($this->relationLoaded('state') && (! $this->state || $this->state->user_id === $user->id)) {
$state = $this->state;
} else {
$state = $this->state()->where('user_id', $user->id)->first();
}
if (! $state) {
$state = new TagState;