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

app/views/groups/index.html.haml

@@ -2,7 +2,9 @@
   welcome home,
   = current_user.profile.first_name
 
-= render "shared/publisher", :group_id => @group.id
+- @group.nil? ? group_id = nil : group_id = @group.id
+
+= render "shared/publisher", :group_id => group_id
 
 %ul#stream
   - for post in @posts

app/views/shared/_publisher.haml

@@ -4,7 +4,8 @@
     = form_for StatusMessage.new, :remote => true do |f|
       = f.error_messages
 
-      = f.hidden_field :group_id, :value => group_id
+      -if group_id
+        = f.hidden_field :group_id, :value => group_id
 
       %p
         %label{:for => "status_message_message"} Message