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

Jump to bottom

Fix forum topic cover handling #11227

Merged
merged 4 commits into from
May 24, 2024
Merged

Fix forum topic cover handling #11227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b7d7fd
Fix existence check for topic cover
nanaya May 23, 2024
4834724
Fix new topic cover model not initialised correctly
nanaya May 23, 2024
271fefd
Adjust comment
nanaya May 23, 2024
ab083d0
Merge branch 'master' into topic-cover
notbakaneko May 24, 2024
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
3 changes: 2 additions & 1 deletion app/Http/Controllers/Forum/TopicsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,8 @@ public function show($id)
$topic->incrementViewCount($currentUser, \Request::ip());
$posts->last()->markRead($currentUser);

$coverModel = $topic->cover ?? new TopicCover();
// Instantiate new cover model separately to prevent it from getting used by opengraph
$coverModel = $topic->cover ?? new TopicCover(['topic_id' => $topic->getKey()]);
$coverModel->setRelation('topic', $topic);
$cover = json_item($coverModel, new TopicCoverTransformer());

Expand Down
2 changes: 1 addition & 1 deletion app/Transformers/Forum/TopicCoverTransformer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class TopicCoverTransformer extends TransformerAbstract
{
public function transform(TopicCover $cover)
{
if ($cover->file_json === null) {
if ($cover->filename === null) {
$data = [
'method' => 'post',
'url' => route('forum.topic-covers.store', [
Expand Down