diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-11-22 09:49:24 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-11-22 09:49:24 +0000 |
| commit | 09ffe8277417a1e486ae60db3254d511b4c64d33 (patch) | |
| tree | 245f90f83681210ceec19a35f29fbf0e06c10252 /app/models/user.rb | |
| parent | 766da660994dbe7c86f556d9cf863411814622fe (diff) | |
| parent | 640aa149fd321658a33466df7b53947b78bccd81 (diff) | |
Merge branch 'develop' into wdtk
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. |