scope option to render takes precedence over serialization_scope

2026-01-25 07:16:49 +00:00 · 2012-07-28 19:05:45 -04:00
parent 1e7c69c729
commit 424dacb457
2 changed files with 3 additions and 3 deletions
--- a/lib/action_controller/serialization.rb
+++ b/lib/action_controller/serialization.rb
@@ -52,7 +52,7 @@ module ActionController
      end

      if serializer
-        options[:scope] = serialization_scope
+        options[:scope] = serialization_scope unless options.has_key?(:scope)
        options[:url_options] = url_options
        json = serializer.new(json, options.merge(default_serializer_options || {}))
      end