diff options
| -rw-r--r-- | vendor/plugins/action_mailer_layouts/init.rb | 4 | ||||
| -rw-r--r-- | vendor/plugins/action_mailer_layouts/plugin.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vendor/plugins/action_mailer_layouts/init.rb b/vendor/plugins/action_mailer_layouts/init.rb index 00cfa8fe1..9c2209171 100644 --- a/vendor/plugins/action_mailer_layouts/init.rb +++ b/vendor/plugins/action_mailer_layouts/init.rb @@ -1,7 +1,7 @@ begin - load(File.join(File.dirname(__FILE__), 'plugin.rb')) + require(File.join(File.dirname(__FILE__), 'plugin.rb')) ActionController::Base.logger.fatal '** Loaded layouts plugin for ActionMailer' rescue Exception => e puts e.inspect ActionController::Base.logger.fatal e if ActionController::Base.logger -end
\ No newline at end of file +end diff --git a/vendor/plugins/action_mailer_layouts/plugin.rb b/vendor/plugins/action_mailer_layouts/plugin.rb index 08ae0fafd..60475d0f7 100644 --- a/vendor/plugins/action_mailer_layouts/plugin.rb +++ b/vendor/plugins/action_mailer_layouts/plugin.rb @@ -7,7 +7,7 @@ module ActionMailer alias_method :render_message_without_layouts, :render_message def render_message(method_name, body) - layout = @layout ? @layout.to_s : self.class.to_s.underscore + layout = "./" + (@layout ? @layout.to_s : self.class.to_s.underscore) md = /^([^\.]+)\.([^\.]+\.[^\.]+)\.(rhtml|rxml)$/.match(method_name) layout << ".#{md.captures[1]}" if md && md.captures[1] layout << ".rhtml" @@ -29,4 +29,4 @@ module ActionMailer File.join(template_root, 'layouts') end end -end
\ No newline at end of file +end |