Skip to content
Browse files

Removing error silencing from the base mailer

  • Loading branch information...
1 parent 45c0514 commit e6f42adee5ac0139656188e66f79dcf59674b48e @bermi bermi committed Jun 18, 2011
Showing with 2 additions and 1 deletion.
  1. +2 −1 action_mailer/base.php
View
3 action_mailer/base.php
@@ -650,7 +650,8 @@ public function render($options = array(),$set_body_only=false,$set_body=null) {
}
}
- $options['locals'] = array_merge((array)@$options['locals'], array('mailer'=>$this,'controller'=>$this));
+ $locals = isset($options['locals']) ? (array)$options['locals'] : array();
+ $options['locals'] = array_merge($locals, array('mailer'=>$this,'controller'=>$this));
if(!empty($body)) {
$options['locals']['body'] = $body;
}

0 comments on commit e6f42ad

Please sign in to comment.
Something went wrong with that request. Please try again.