diff options
| author | francis <francis> | 2008-11-21 01:50:06 +0000 |
|---|---|---|
| committer | francis <francis> | 2008-11-21 01:50:06 +0000 |
| commit | 8c9355bd7281c990f6fb5e5dda195929119982cf (patch) | |
| tree | ec200747ffa76425bf50e8833c995e92a6deab54 /app/models/user.rb | |
| parent | 0a60234176af18f43956bec0747ce0c16dde583f (diff) | |
Move TMail monkeypatches out of incoming_message into
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 162d86d35..d4fbceb21 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -22,7 +22,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: user.rb,v 1.74 2008-10-28 13:04:20 francis Exp $ +# $Id: user.rb,v 1.75 2008-11-21 01:50:06 francis Exp $ require 'digest/sha1' @@ -154,7 +154,7 @@ class User < ActiveRecord::Base # For use in to/from in email messages def name_and_email - return self.name + " <" + self.email + ">" + return TMail::Address.encode_quoted_string(self.name) + " <" + self.email + ">" end # The "internal admin" is a special user for internal use. |