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

Merge branch '583-password-person-conflict' of https://github.com/flah00/diaspora into flah00-583-password-person-conflict

Browse source
This commit is contained in:
maxwell 2010-12-04 18:40:17 -08:00
commit 8fb97072df
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

@ -384,8 +384,8 @@ class User
self.invitation_token = nil self.invitation_token = nil
self.password = opts[:password] self.password = opts[:password]
self.password_confirmation = opts[:password_confirmation] self.password_confirmation = opts[:password_confirmation]
self.person.save!
self.save! self.save!
self.person.save!
invitations_to_me.each{|invitation| invitation.to_request!} invitations_to_me.each{|invitation| invitation.to_request!}
self.reload # Because to_request adds a request and saves elsewhere self.reload # Because to_request adds a request and saves elsewhere