lib/futurism/channel.rb in futurism-0.3.2 vs lib/futurism/channel.rb in futurism-0.3.3

@@ -9,10 +9,11 @@
     def receive(data)
       resources = data["signed_params"].map { |signed_params|
         [signed_params, Rails.application.message_verifier("futurism").verify(signed_params)]
       }
 
-      ApplicationController.renderer.instance_variable_set(:@env, connection.env)
+      new_env = connection.env.merge(ApplicationController.renderer.instance_variable_get(:@env))
+      ApplicationController.renderer.instance_variable_set(:@env, new_env)
 
       resources.each do |signed_params, resource|
         cable_ready["Futurism::Channel"].outer_html(
           selector: "[data-signed-params='#{signed_params}']",
           html: ApplicationController.render(resource)