From 3faca8380b5bac4ab9159d1777affda681ff9216 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 20 Oct 2010 14:52:18 +0200
Subject: [PATCH] Revert "Merge remote branch 'upstream/master'"

This reverts commit 4bb5aeb34baa4dbe5a2b438f58bf05afc78953f0, reversing
changes made to fb70dc8c99a1bc7a8a3595b9cdd9d53d1ff81bab.
---
 app/models/user.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index cc9531c8c..aee21b543 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -64,7 +64,7 @@ class User
 
   #after_create :seed_aspects
 
-  before_destroy :unfriend_everyone, :remove_person
+  before_destroy :unfriend_everyone, :remove_person, :remove_all_aspects
 
   def strip_username
     if username.present?
@@ -436,4 +436,8 @@ class User
       end
     }
   end
+  
+  def remove_all_aspects
+    aspects.destroy_all
+  end
 end