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

2010-08-24 14:22:47 -07:00 · 2010-08-24 14:22:47 -07:00 · d92ae1c871
commit d92ae1c871
parent a70132fcdc b4ab91043a
1 changed files with 5 additions and 3 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -16,9 +16,11 @@ class ApplicationController < ActionController::Base
  end
  
  def set_friends_and_status
-    @group = :all
-    @groups = current_user.groups
-    @friends = current_user.friends
+    unless current_user.nil?
+      @group = :all
+      @groups = current_user.groups
+      @friends = current_user.friends
+    end
  end

  def count_requests