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

Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots

Browse source 
Conflicts:
	app/models/user.rb
This commit is contained in:
Raphael 2010-08-18 10:13:25 -07:00
commit 1685e0c28b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/user.rb
View file

@ -285,12 +285,13 @@ class User
def visible_person_by_id( id ) def visible_person_by_id( id )
id = ensure_bson id id = ensure_bson id
return self if id == person.id return self.person if id == self.person.id
friends.detect{|x| x.id == id } friends.detect{|x| x.id == id }
end end
def group_by_id( id ) def group_by_id( id )
groups.detect{|x| x.id == ensure_bson( id ) } id = ensure_bson id
groups.detect{|x| x.id == id }
end end
def tommy? def tommy?