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

app/controllers/dev_utilities_controller.rb

@@ -58,7 +58,9 @@ def warzombie
   def set_profile_photo
 
     render :nothing => true
-    album = current_user.post(:album, :name => "Profile Photos")
+    album = Album.create(:person => current_user.person, :name => "Profile Photos")
+    current_user.raw_visible_posts << album
+    current_user.save
     
     backer_number = YAML.load_file(Rails.root.join('config','backer_number.yml'))[:seed_number].to_i
     username = backer_info[backer_number]['username'].gsub(/ /,'').downcase

app/models/user.rb

@@ -229,6 +229,9 @@ class User
     self.person.save!
   end
 
+  def all_group_ids
+    self.groups.all.collect{|x| x.id}
+  end
   protected
    def generate_key
     OpenSSL::PKey::RSA::generate 1024