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

fix: extensions not being able to use the renderer without context (#3382)

Browse Source
This commit is contained in:
Ian Morland 2022-04-07 17:53:37 +01:00 committed by GitHub
parent c944fd0029
commit b0fa795cc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/mentions/src/Formatter/FormatUserMentions.php
View File

@ -45,7 +45,7 @@ class FormatUserMentions
public function __invoke(Renderer $renderer, $context, string $xml) public function __invoke(Renderer $renderer, $context, string $xml)
{ {
return Utils::replaceAttributes($xml, 'USERMENTION', function ($attributes) use ($context) { return Utils::replaceAttributes($xml, 'USERMENTION', function ($attributes) use ($context) {
$user = (isset($context->getRelations()['mentionsUsers']) || $context instanceof Post) $user = (($context && isset($context->getRelations()['mentionsUsers'])) || $context instanceof Post)
? $context->mentionsUsers->find($attributes['id']) ? $context->mentionsUsers->find($attributes['id'])
: User::find($attributes['id']); : User::find($attributes['id']);

2
extensions/mentions/src/Formatter/UnparseUserMentions.php
View File

@ -51,7 +51,7 @@ class UnparseUserMentions
protected function updateUserMentionTags($context, string $xml): string protected function updateUserMentionTags($context, string $xml): string
{ {
return Utils::replaceAttributes($xml, 'USERMENTION', function ($attributes) use ($context) { return Utils::replaceAttributes($xml, 'USERMENTION', function ($attributes) use ($context) {
$user = (isset($context->getRelations()['mentionsUsers']) || $context instanceof Post) $user = (($context && isset($context->getRelations()['mentionsUsers'])) || $context instanceof Post)
? $context->mentionsUsers->find($attributes['id']) ? $context->mentionsUsers->find($attributes['id'])
: User::find($attributes['id']); : User::find($attributes['id']);