diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-11-20 16:14:22 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-11-20 16:14:22 +0000 |
| commit | fcb6cdd6342d0272a8e7f05d20a4b0d87da70de9 (patch) | |
| tree | 48ea4a5a796c4e95d26e4d4f36170ac09d368637 /app/models/user.rb | |
| parent | b0d9551a83c4a101ac808f1c35f66dd138cbc0f1 (diff) | |
| parent | 24c3ceb2315734ab6e43ae4f75673e251b98a96e (diff) | |
Merge remote-tracking branch 'origin/feature/isolate-mail-handling' into develop
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 70386f7e4..6e1e21481 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -203,7 +203,7 @@ class User < ActiveRecord::Base # For use in to/from in email messages def name_and_email - return TMail::Address.address_from_name_and_email(self.name, self.email).to_s + return MailHandler.address_from_name_and_email(self.name, self.email) end # The "internal admin" is a special user for internal use. |