diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-09-30 22:27:02 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-09-30 22:27:02 +0100 |
| commit | dd2779e1b83b4d867d47dd286ec0c919f5df12a9 (patch) | |
| tree | 6e52ea0a329c24429f4d1d41b065e082f0ed6baa /actionmailer/lib/action_mailer | |
| parent | 329b14aa8fdd291a00d17ba12c2e0ab4c3a157cc (diff) | |
| parent | 420004e030e96f2ace6e27fd622c90ee9e986677 (diff) | |
| download | rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.tar.gz rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.tar.bz2 rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionmailer/lib/action_mailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/helpers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/helpers.rb b/actionmailer/lib/action_mailer/helpers.rb index 1bb8682315..ecd8f0f5b6 100644 --- a/actionmailer/lib/action_mailer/helpers.rb +++ b/actionmailer/lib/action_mailer/helpers.rb @@ -106,7 +106,7 @@ module ActionMailer private # Extend the template class instance with our controller's helper module. def initialize_template_class_with_helper(assigns) - returning(template = initialize_template_class_without_helper(assigns)) do + initialize_template_class_without_helper(assigns).tap do |template| template.extend self.class.master_helper_module end end |