group mergeGlobal inside sendMessage function

Author: armetiz

Mailer/TwigSwiftMailer.php

@@ -38,10 +38,10 @@ public function sendConfirmationEmailMessage(UserInterface $user)
         $template = $this->parameters['template']['confirmation'];
         $url = $this->router->generate('fos_user_registration_confirm', array('token' => $user->getConfirmationToken()), true);
 
-        $context = $this->twig->mergeGlobals(array(
+        $context = array(
             'user' => $user,
             'confirmationUrl' => $url
-        ));
+        );
 
         $this->sendMessage($template, $context, $this->parameters['from_email']['confirmation'], $user->getEmail());
     }
@@ -51,10 +51,10 @@ public function sendResettingEmailMessage(UserInterface $user)
         $template = $this->parameters['template']['resetting'];
         $url = $this->router->generate('fos_user_resetting_reset', array('token' => $user->getConfirmationToken()), true);
 
-        $context = $this->twig->mergeGlobals(array(
+        $context = array(
             'user' => $user,
             'confirmationUrl' => $url
-        ));
+        );
 
         $this->sendMessage($template, $context, $this->parameters['from_email']['resetting'], $user->getEmail());
     }
@@ -67,6 +67,7 @@ public function sendResettingEmailMessage(UserInterface $user)
      */
     protected function sendMessage($templateName, $context, $fromEmail, $toEmail)
     {
+        $context = $this->twig->mergeGlobals($context);
         $template = $this->twig->loadTemplate($templateName);
         $subject = $template->renderBlock('subject', $context);
         $textBody = $template->renderBlock('body_text', $context);