From 0d42285496ca9f2c76d7e620eea69d815d152b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 10 Feb 2014 01:19:21 +0100 Subject: [PATCH] Do not update_attributes with a nil id Rails 4 accepts that as a parameter thus setting the id to nil thus thinking it'd be a new record when we just want to update it --- lib/diaspora/federated/shareable.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/diaspora/federated/shareable.rb b/lib/diaspora/federated/shareable.rb index a2c4ce957..3921395cb 100644 --- a/lib/diaspora/federated/shareable.rb +++ b/lib/diaspora/federated/shareable.rb @@ -2,9 +2,9 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -#this module attempts to be what you need to mix into +#this module attempts to be what you need to mix into # base level federation objects that are not relayable, and not persistable -#assumes there is an author, author_id, id, +#assumes there is an author, author_id, id, module Diaspora module Federated module Shareable @@ -85,7 +85,7 @@ module Diaspora known_shareable = user.find_visible_shareable_by_id(self.class.base_class, self.guid, :key => :guid) if known_shareable if known_shareable.mutable? - known_shareable.update_attributes(self.attributes) + known_shareable.update_attributes(self.attributes.except("id")) true else Rails.logger.info("event=receive payload_type=#{self.class} update=true status=abort sender=#{self.diaspora_handle} reason=immutable") #existing_shareable=#{known_shareable.id}") @@ -113,4 +113,4 @@ module Diaspora end end end -end \ No newline at end of file +end