diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mail_handler/backends/mail_backend.rb | 6 | ||||
| -rw-r--r-- | lib/xapian_queries.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/mail_handler/backends/mail_backend.rb b/lib/mail_handler/backends/mail_backend.rb index 9e3fbc008..34fbc91ab 100644 --- a/lib/mail_handler/backends/mail_backend.rb +++ b/lib/mail_handler/backends/mail_backend.rb @@ -368,11 +368,11 @@ module MailHandler raise "invalid email " + email + " passed to address_from_name_and_email" end if name.nil? - return Mail::Address.new(email).to_s + return Mail::Address.new(email.dup).to_s end address = Mail::Address.new - address.display_name = name - address.address = email + address.display_name = name.dup + address.address = email.dup address.to_s end diff --git a/lib/xapian_queries.rb b/lib/xapian_queries.rb index 5c02ba788..dbb17f592 100644 --- a/lib/xapian_queries.rb +++ b/lib/xapian_queries.rb @@ -77,10 +77,10 @@ module XapianQueries end def make_query_from_params(params) - query = params[:query] || "" if query.nil? + query = params.fetch(:query) { '' } query += get_date_range_from_params(params) query += get_request_variety_from_params(params) query += get_status_from_params(params) - return query + query end end |