nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MS IZ changing it back

Browse source
This commit is contained in:
ilya 2010-08-12 10:04:56 -07:00
parent 9bec1131f6
commit 26bebbe393
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/user.rb
View file

@ -124,11 +124,7 @@ class User
Rails.logger.debug("Receiving object:\n#{object.inspect}") Rails.logger.debug("Receiving object:\n#{object.inspect}")
if object.is_a? Retraction if object.is_a? Retraction
if object.type == 'Person' object.perform self.id
unfriend object.person_id
else
object.perform self.id
end
elsif object.is_a? Request elsif object.is_a? Request
person = Diaspora::Parser.get_or_create_person_object_from_xml( xml ) person = Diaspora::Parser.get_or_create_person_object_from_xml( xml )
person.serialized_key ||= object.exported_key person.serialized_key ||= object.exported_key