diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 590199ed8..33f48e511 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -58,9 +58,11 @@ class Mailer < ActionMailer::Base options = {:protocol => Setting.protocol} if Setting.host_name.to_s =~ /\A(https?\:\/\/)?(.+?)(\:(\d+))?(\/.+)?\z/i host, port, prefix = $2, $4, $5 - options.merge!({ - :host => host, :port => port, :script_name => prefix - }) + options.merge!( + { + :host => host, :port => port, :script_name => prefix + } + ) else options[:host] = Setting.host_name end