mastofe

commit: 881856553e0c2ba96cbe20ed7bbbbd02b4c60ef4
parent: 0a6b0986685e6a54042b22ae01df4dd0aad9f6b0
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue, 12 Sep 2017 00:16:18 +0200

Fix #4894 - Merge context hash into final JSON hash after key transform (#4898)


Diffstat:
M
app/lib/activitypub/adapter.rb
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb
@@ -28,7 +28,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
 
   def serializable_hash(options = nil)
     options = serialization_options(options)
-    serialized_hash = CONTEXT.merge(ActiveModelSerializers::Adapter::Attributes.new(serializer, instance_options).serializable_hash(options))
-    self.class.transform_key_casing!(serialized_hash, instance_options)
+    serialized_hash = ActiveModelSerializers::Adapter::Attributes.new(serializer, instance_options).serializable_hash(options)
+    CONTEXT.merge(self.class.transform_key_casing!(serialized_hash, instance_options))
   end
 end