mirror of
https://github.com/flarum/core.git
synced 2025-08-05 07:57:46 +02:00
fix(regression): discussion creation fails
This commit is contained in:
@@ -240,7 +240,7 @@ class DiscussionResource extends AbstractDatabaseResource
|
||||
/** @param Discussion $model */
|
||||
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 */
|
||||
|
@@ -117,13 +117,9 @@ class Discussion extends AbstractModel
|
||||
/**
|
||||
* 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;
|
||||
|
||||
if ($title) {
|
||||
$discussion->title = $title;
|
||||
}
|
||||
$discussion = $model ?? new static;
|
||||
|
||||
$discussion->created_at = Carbon::now();
|
||||
$discussion->user_id = $user->id;
|
||||
|
Reference in New Issue
Block a user