Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Added 'helpers' to _applyConfig.
Allows default Helpers to be modified by EmailConfig setup.

Conflicts:

	lib/Cake/Network/Email/CakeEmail.php
  • Loading branch information
mhamann authored and markstory committed Jun 23, 2012
1 parent 5c29c4d commit a7ef245
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/Cake/Network/Email/CakeEmail.php
Expand Up @@ -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])) {
Expand Down

0 comments on commit a7ef245

Please sign in to comment.