fix context var priority

yii1tech · May 20, 2024 · cf1c9a1 · cf1c9a1
1 parent c70d0b8
commit cf1c9a1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Mailer.php b/src/Mailer.php
@@ -265,7 +265,7 @@ protected function render(RawMessage $message): RawMessage
         if (($textTemplate = $message->getTextTemplate()) !== null) {
             $text = $this->getView()->render(
                 $textTemplate,
-                array_merge($message->getContext(), ['_message' => $message]),
+                array_merge(['_message' => $message], $message->getContext()),
                 $message->getLocale()
             );
 
@@ -275,7 +275,7 @@ protected function render(RawMessage $message): RawMessage
         if (($htmlTemplate = $message->getHtmlTemplate()) !== null) {
             $html = $this->getView()->render(
                 $htmlTemplate,
-                array_merge($message->getContext(), ['_message' => $message]),
+                array_merge(['_message' => $message], $message->getContext()),
                 $message->getLocale()
             );