Merge branch 'master' of github.com:diaspora/diaspora

app/models/group.rb

@@ -21,7 +21,7 @@ class Group
   end
   
   def posts_by_person_id( id )
-    id = ensure_bson id
+    id = id.to_id
     posts.detect{|x| x.person.id == id }
   end
 end

app/models/user.rb

@@ -51,7 +51,7 @@ class User
         puts posts_to_move.inspect
         to_group.people << friend
         to_group.posts << posts_to_move
-        from_group.person_ids.delete(ensure_bson(friend.id))
+        from_group.person_ids.delete(friend.id.to_id)
         posts_to_move.each{ |x| from_group.post_ids.delete(x.id)}
         from_group.save
         to_group.save

app/views/groups/edit.html.haml

@@ -16,6 +16,7 @@
       stuff
       -for person in group.people
         %li.person
+          = image_tag (person.profile.image_url(:thumb_small),:size => "30x30")  unless person.profile.image_url.nil?
           = person.real_name