From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 11 Sep 2017 22:16:18 +0000 (+0200)
Subject: Fix #4894 - Merge context hash into final JSON hash after key transform (#4898)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=881856553e0c2ba96cbe20ed7bbbbd02b4c60ef4;p=mastodon.git

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

diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb
index 6ed66a239..3228a3f03 100644
--- 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