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

2010-08-24 11:12:04 -07:00 · 2010-08-24 11:12:04 -07:00 · 85c268b5eb
commit 85c268b5eb
parent 4ffb8e7fa3 fb33d955c9
2 changed files with 4 additions and 6 deletions
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@ -30,10 +30,8 @@ class GroupsController < ApplicationController
  end
  
  def show
-    @person_ids = @group.person_ids
-
    @group = Group.first(:id => params[:id])
-
+    @friends = @group.people
    @posts = current_user.visible_posts( :by_members_of => @group ).paginate :order => 'created_at DESC'
  end