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

Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor

Browse source
This commit is contained in:
Raphael 2010-08-10 16:56:42 -07:00
commit 4b102de1db
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

@ -77,7 +77,7 @@ class User
def receive_friend_request(friend_request)
Rails.logger.debug("receiving friend request #{friend_request.to_json}")
if Request.where(:callback_url => person.url, :destination_url => person.url).first
if Request.where(:callback_url => person.receive_url, :destination_url => person.receive_url).first
activate_friend friend_request.person
Rails.logger.debug("#{self.real_name}'s friend request has been accepted")
friend_request.destroy