Don't set layout based on mailer's name.

Closes #7234
cakephp · Aug 15, 2015 · 46980b6 · 46980b6
1 parent b73e3f6
commit 46980b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/Mailer/Mailer.php b/src/Mailer/Mailer.php
@@ -73,7 +73,7 @@
  *     if ($entity->isNew()) {
  *          $this->send('welcome', [$entity]);
  *      }
- *  }
+ * }
  * ```
  *
  * The onRegistration method converts the application event into a mailer method.
@@ -82,6 +82,7 @@
  */
 abstract class Mailer implements ArrayAccess, EventListenerInterface
 {
+
     use ModelAwareTrait;
 
     /**
@@ -116,10 +117,6 @@ public function __construct(Email $email = null)
             $email = new Email();
         }
 
-        if ($this->layout === null) {
-            $this->layout = Inflector::underscore($this->getName());
-        }
-
         $this->_email = $email;
     }
 

diff --git a/tests/TestCase/Mailer/MailerTest.php b/tests/TestCase/Mailer/MailerTest.php
@@ -28,7 +28,6 @@ public function testConstructor()
     {
         $mailer = new TestMailer();
         $this->assertInstanceOf('Cake\Mailer\Email', $mailer->getEmailForAssertion());
-        $this->assertEquals('test', $mailer->layout);
     }
 
     public function testReset()