bug; when someone sends you an unknown request, your server crashes.

2010-10-28 00:50:49 -07:00 · 2010-10-28 00:50:49 -07:00 · 09c4def70b
commit 09c4def70b
parent fdb169558a
1 changed files with 5 additions and 3 deletions
--- a/lib/diaspora/user/receiving.rb
+++ b/lib/diaspora/user/receiving.rb
@ -83,9 +83,11 @@ module Diaspora
        request.person.save
        old_request =  Request.first(:id => request.id)
        Rails.logger.info("I got a reqest_id #{request.id} with old request #{old_request.inspect}")
-        request.aspect_id = old_request.aspect_id if old_request
-        request.save
-        receive_friend_request(request)
+        if old_request
+          request.aspect_id = old_request.aspect_id if old_request
+          request.save
+          receive_friend_request(request)
+        end
      end

      def receive_profile profile, xml