From 67d5eefd8ec69a9165cf4df17ce1752d1888083f Mon Sep 17 00:00:00 2001
From: Jo Liss <joliss42@gmail.com>
Date: Sun, 15 Apr 2012 18:17:50 +0200
Subject: [PATCH] Simplify code

---
 lib/action_controller/serialization.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/action_controller/serialization.rb b/lib/action_controller/serialization.rb
index 1a981e56..2b384948 100644
--- a/lib/action_controller/serialization.rb
+++ b/lib/action_controller/serialization.rb
@@ -49,12 +49,7 @@ module ActionController
 
       if serializer
         options[:scope] = serialization_scope
-
-        if default_options = default_serializer_options
-          options = options.merge(default_options)
-        end
-
-        json = serializer.new(json, options)
+        json = serializer.new(json, options.merge(default_serializer_options || {}))
       end
       super
     end