Only Object to_json alias is needed. Prefer nil options.

1 files changed, 7 insertions, 7 deletions

diff --git a/activesupport/lib/active_support/json/encoders/hash.rb b/activesupport/lib/active_support/json/encoders/hash.rb
index 19b97d7b8c..cd8639c1dd 100644
--- a/activesupport/lib/active_support/json/encoders/hash.rb
+++ b/activesupport/lib/active_support/json/encoders/hash.rb
@@ -30,13 +30,15 @@ class Hash
   # would pass the <tt>:include => :posts</tt> option to <tt>users</tt>,
   # allowing the posts association in the User model to be converted to JSON
   # as well.
-  def rails_to_json(options = {}) #:nodoc:
+  def rails_to_json(options = nil) #:nodoc:
     hash_keys = self.keys
 
-    if except = options[:except]
-      hash_keys = hash_keys - Array.wrap(except)
-    elsif only = options[:only]
-      hash_keys = hash_keys & Array.wrap(only)
+    if options
+      if except = options[:except]
+        hash_keys = hash_keys - Array.wrap(except)
+      elsif only = options[:only]
+        hash_keys = hash_keys & Array.wrap(only)
+      end
     end
 
     result = '{'
@@ -45,6 +47,4 @@ class Hash
     end * ','
     result << '}'
   end
-
-  alias to_json rails_to_json
 end