Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix setting null profile extras order #11812

Merged
merged 2 commits into from
Jan 27, 2025
Merged

Fix setting null profile extras order #11812

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37c4d11
Fix setting null profile extras order
nanaya Jan 23, 2025
79dcc19
Merge branch 'master' into extras-order-array
notbakaneko Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions app/Models/UserProfileCustomization.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public static function forUser(?User $user): array|static
return $ret;
}

public static function repairExtrasOrder($value)
public static function repairExtrasOrder(array $value): array
{
// read from inside out
return array_values(
Expand Down Expand Up @@ -316,7 +316,10 @@ public function getExtrasOrderAttribute($value)
public function setExtrasOrderAttribute($value)
{
$this->attributes['extras_order'] = null;
$this->setOption('extras_order', static::repairExtrasOrder($value));
$this->setOption(
'extras_order',
$value === null ? null : static::repairExtrasOrder($value),
);
}

public function getProfileCoverExpandedAttribute()
Expand Down
Loading