From 2f3d42a3f91d5c9127842cf91d4cd9d756eb4cf7 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Fri, 4 Jul 2014 18:14:09 +1000
Subject: [PATCH] Improvements to mailer classes

---
 modules/backend/widgets/Form.php              | 1 -
 modules/system/ServiceProvider.php            | 4 ++--
 modules/system/controllers/EmailTemplates.php | 9 +++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index 66b85cc54..df83363c3 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -266,7 +266,6 @@ class Form extends WidgetBase
         $this->setFormValues($saveData);
         $this->prepareVars();
 
-
         /*
          * If an array of fields is supplied, update specified fields individually.
          */
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index 614cf0cb2..779f6e8fc 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -108,8 +108,8 @@ class ServiceProvider extends ModuleServiceProvider
         /*
          * Override standard Mailer content with template
          */
-        Event::listen('mailer.register', function() {
-            App::make('mailer')->bindEvent('content.beforeAdd', function($message, $view, $plain, $data){
+        Event::listen('mailer.register', function($provider, $mailer) {
+            $mailer->bindEvent('beforeAddContent', function($message, $view, $plain, $data){
                 if (EmailTemplate::addContentToMailer($message, $view, $data))
                     return false;
             });
diff --git a/modules/system/controllers/EmailTemplates.php b/modules/system/controllers/EmailTemplates.php
index a23e4fb62..96b6a077a 100644
--- a/modules/system/controllers/EmailTemplates.php
+++ b/modules/system/controllers/EmailTemplates.php
@@ -60,8 +60,13 @@ class EmailTemplates extends Controller
             $model = $this->formFindModelObject($recordId);
             $user = BackendAuth::getUser();
 
-            Mail::send($model->code, [], function($message) use ($user) {
-                $message->to($user->email, $user->full_name);
+            $vars = [
+                'email' => $user->email,
+                'name'  => $user->full_name,
+            ];
+            Mail::send($model->code, [], function($message) use ($vars) {
+                extract($vars);
+                $message->to($email, $name);
             });
 
             Flash::success('The test message has been successfully sent.');