diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/change_email_validator.rb | 2 | ||||
| -rw-r--r-- | app/models/incoming_message.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/change_email_validator.rb b/app/models/change_email_validator.rb index a796489f7..ff7f2f931 100644 --- a/app/models/change_email_validator.rb +++ b/app/models/change_email_validator.rb @@ -25,7 +25,7 @@ class ChangeEmailValidator < ActiveRecord::BaseWithoutTable end if !errors[:old_email] - if self.old_email != self.logged_in_user.email + if self.old_email.downcase != self.logged_in_user.email.downcase errors.add(:old_email, "address isn't the same as the address of the account you are logged in with") elsif !self.logged_in_user.has_this_password?(self.password) if !errors[:password] diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 949846e69..38d743d18 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -538,7 +538,7 @@ class IncomingMessage < ActiveRecord::Base uncompressed_text = child.read() end # if we managed to uncompress the PDF... - if !uncompressed_text.nil? + if !uncompressed_text.nil? && !uncompressed_text.empty? # then censor stuff (making a copy so can compare again in a bit) censored_uncompressed_text = uncompressed_text.dup self._binary_mask_stuff_internal!(censored_uncompressed_text) @@ -551,7 +551,7 @@ class IncomingMessage < ActiveRecord::Base child.close_write() recompressed_text = child.read() end - if !recompressed_text.nil? + if !recompressed_text.nil? && !recompressed_text.empty? text[0..-1] = recompressed_text # [0..-1] makes it change the 'text' string in place end end |