diff options
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index afbc63ba9..46ea25fcd 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -19,7 +19,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.18 2008-01-10 18:20:35 francis Exp $ +# $Id: user.rb,v 1.19 2008-01-14 10:43:30 francis Exp $ require 'digest/sha1' @@ -78,6 +78,11 @@ class User < ActiveRecord::Base self.hashed_password = User.encrypted_password(self.password, self.salt) end + # For use in to/from in email messages + def name_and_email + return self.name + " <" + self.email + ">" + end + private def self.encrypted_password(password, salt) |