Permalink
Browse files

Added 'helpers' to _applyConfig.

Allows default Helpers to be modified by EmailConfig setup.

Conflicts:

	lib/Cake/Network/Email/CakeEmail.php
  • Loading branch information...
1 parent 5c29c4d commit a7ef245de573a17d37ba815781feb264d1d827ae @mhamann mhamann committed with markstory Feb 22, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/Cake/Network/Email/CakeEmail.php
@@ -1134,7 +1134,7 @@ protected function _applyConfig($config) {
$simpleMethods = array(
'from', 'sender', 'to', 'replyTo', 'readReceipt', 'returnPath', 'cc', 'bcc',
'messageId', 'domain', 'subject', 'viewRender', 'viewVars', 'attachments',
- 'transport', 'emailFormat', 'theme',
+ 'transport', 'emailFormat', 'theme', 'helpers'
);
foreach ($simpleMethods as $method) {
if (isset($config[$method])) {

0 comments on commit a7ef245

Please sign in to comment.