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

always import the key

Browse source
This commit is contained in:
Raphael 2010-07-14 11:55:15 -07:00
parent 2e0e904cdb
commit d7d1af8058
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

@ -56,11 +56,11 @@ class User < Person
end
def receive_friend_request(friend_request)
GPGME.import(friend_request.exported_key)
if Request.where(:callback_url => friend_request.callback_url).first
friend_request.activate_friend
friend_request.destroy
else
GPGME.import(friend_request.exported_key)
friend_request.person.save
friend_request.save
end