nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

using blank instead of checking for nil, since mongo import make these bank

Browse source
This commit is contained in:
zhitomirskiyi 2011-02-05 16:53:14 -08:00
parent 80da5917fa
commit e3170504b8
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/invitation.rb
View file

@ -57,7 +57,7 @@ class Invitation < ActiveRecord::Base
invitee.invites = opts[:invites] || 5
if invitee.new_record?
invitee.errors.clear
invitee.serialized_private_key ||= User.generate_key
invitee.serialized_private_key = User.generate_key if invitee.serialized_private_key.blank?
invitee.send(:generate_invitation_token)
elsif invitee.invitation_token.nil?
return invitee

2
app/models/user.rb
View file

@ -260,7 +260,7 @@ class User < ActiveRecord::Base
self.person.url = AppConfig[:pod_url]
self.serialized_private_key ||= User.generate_key
self.serialized_private_key = User.generate_key if self.serialized_private_key.blank?
self.person.serialized_public_key = OpenSSL::PKey::RSA.new(self.serialized_private_key).public_key
self