diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-01-15 16:05:25 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-01-15 16:05:25 +0000 |
| commit | d1cac849b5c74e4f0d35b193ad24eed1d6b66af6 (patch) | |
| tree | cb153b82b3e1d451be2d299b6114c99b6610b173 /app/models/user.rb | |
| parent | f25df72186683e54dd10fd5aa94e1e26dff8ea92 (diff) | |
| parent | 7cc8cae3a669fc5de91d6bc23812c265e8af4c93 (diff) | |
Merge branch 'release/0.6.9'
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. |