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

fix(regression): discussion creation fails

Browse Source
This commit is contained in:
Sami Mazouz 2024-11-04 11:28:57 +01:00
parent b3a40115af
commit ffea0db012
No known key found for this signature in database
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Api/Resource/DiscussionResource.php
View File

@ -240,7 +240,7 @@ class DiscussionResource extends AbstractDatabaseResource
/** @param Discussion $model */ /** @param Discussion $model */
public function creating(object $model, \Tobyz\JsonApiServer\Context $context): ?object public function creating(object $model, \Tobyz\JsonApiServer\Context $context): ?object
{ {
return Discussion::start(null, $context->getActor()); return Discussion::start(null, $context->getActor(), $model);
} }
/** @param Discussion $model */ /** @param Discussion $model */

8
framework/core/src/Discussion/Discussion.php
View File

@ -117,13 +117,9 @@ class Discussion extends AbstractModel
/** /**
* Start a new discussion. Raises the DiscussionWasStarted event. * Start a new discussion. Raises the DiscussionWasStarted event.
*/ */
public static function start(?string $title, User $user): static public static function start(?string $title, User $user, self $model = null): static
{ {
$discussion = new static; $discussion = $model ?? new static;
if ($title) {
$discussion->title = $title;
}
$discussion->created_at = Carbon::now(); $discussion->created_at = Carbon::now();
$discussion->user_id = $user->id; $discussion->user_id = $user->id;