diff --git a/app/models/channel/assets.rb b/app/models/channel/assets.rb index 81aabda9a..283b1c55d 100644 --- a/app/models/channel/assets.rb +++ b/app/models/channel/assets.rb @@ -39,7 +39,6 @@ returns data[ self.class.to_app_model ][ id ] = attributes end - return data if !self['created_by_id'] && !self['updated_by_id'] %w(created_by_id updated_by_id).each {|local_user_id| next if !self[ local_user_id ] diff --git a/lib/email_helper.rb b/lib/email_helper.rb index 3de3e77c2..f4b8bcbbd 100644 --- a/lib/email_helper.rb +++ b/lib/email_helper.rb @@ -18,13 +18,13 @@ returns def self.available_driver if Setting.get('system_online_service') return { - :inbound => ['imap', 'pop3'], - :outbound => ['smtp'], + inbound: %w(imap pop3), + outbound: %w(smtp), } end { - :inbound => ['imap', 'pop3'], - :outbound => ['smtp', 'sendmail'], + inbound: %w(imap pop3), + outbound: %w(smtp sendmail), } end diff --git a/lib/email_helper/verify.rb b/lib/email_helper/verify.rb index fe3fec00a..dec5a1a5e 100644 --- a/lib/email_helper/verify.rb +++ b/lib/email_helper/verify.rb @@ -74,7 +74,6 @@ or result: 'failed', message: "Unknown adapter '#{adapter}'", } - return end # looking for verify email