fix(mentions): return early if xml null

flarum · Oct 7, 2024 · 20c292c · 20c292c
1 parent 2d598e5
commit 20c292c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/extensions/mentions/src/Formatter/UnparsePostMentions.php b/extensions/mentions/src/Formatter/UnparsePostMentions.php
@@ -34,6 +34,10 @@ public function __construct(TranslatorInterface $translator)
      */
     public function __invoke($context, $xml)
     {
+        if ($xml === null) {
+            return $xml;
+        }
+
         $xml = $this->updatePostMentionTags($context, $xml);
         $xml = $this->unparsePostMentionTags($xml);
 

diff --git a/extensions/mentions/src/Formatter/UnparseTagMentions.php b/extensions/mentions/src/Formatter/UnparseTagMentions.php
@@ -24,6 +24,10 @@ class UnparseTagMentions
      */
     public function __invoke($context, $xml)
     {
+        if ($xml === null) {
+            return $xml;
+        }
+
         $xml = $this->updateTagMentionTags($context, $xml);
         $xml = $this->unparseTagMentionTags($xml);
 

diff --git a/extensions/mentions/src/Formatter/UnparseUserMentions.php b/extensions/mentions/src/Formatter/UnparseUserMentions.php
@@ -35,6 +35,10 @@ public function __construct(TranslatorInterface $translator)
      */
     public function __invoke($context, $xml)
     {
+        if ($xml === null) {
+            return $xml;
+        }
+
         $xml = $this->updateUserMentionTags($context, $xml);
         $xml = $this->unparseUserMentionTags($xml);