From b0fa795cc936a5538af892312e97bbf763625e18 Mon Sep 17 00:00:00 2001
From: Ian Morland <16573496+imorland@users.noreply.github.com>
Date: Thu, 7 Apr 2022 17:53:37 +0100
Subject: [PATCH] fix: extensions not being able to use the renderer without
 context (#3382)

---
 extensions/mentions/src/Formatter/FormatUserMentions.php  | 2 +-
 extensions/mentions/src/Formatter/UnparseUserMentions.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/mentions/src/Formatter/FormatUserMentions.php b/extensions/mentions/src/Formatter/FormatUserMentions.php
index fab597af1..f0e6fdbb6 100644
--- a/extensions/mentions/src/Formatter/FormatUserMentions.php
+++ b/extensions/mentions/src/Formatter/FormatUserMentions.php
@@ -45,7 +45,7 @@ class FormatUserMentions
     public function __invoke(Renderer $renderer, $context, string $xml)
     {
         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'])
                 : User::find($attributes['id']);
 
diff --git a/extensions/mentions/src/Formatter/UnparseUserMentions.php b/extensions/mentions/src/Formatter/UnparseUserMentions.php
index 4f114636a..b150d2f7b 100644
--- a/extensions/mentions/src/Formatter/UnparseUserMentions.php
+++ b/extensions/mentions/src/Formatter/UnparseUserMentions.php
@@ -51,7 +51,7 @@ class UnparseUserMentions
     protected function updateUserMentionTags($context, string $xml): string
     {
         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'])
                 : User::find($attributes['id']);