1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index bb99fac5e0..75be2cc260 100755
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -98,7 +98,7 @@ module ActionDispatch
     end
 
     def forgery_whitelisted?
-      method == :get || xhr? || !(!content_type.nil? && content_type.verify_request?)
+      method == :get || xhr? || content_type.nil? || !content_type.verify_request?
     end
 
     def media_type
@@ -205,10 +205,6 @@ module ActionDispatch
       end
     end
 
-    def cache_format
-      parameters[:format]
-    end
-
     # Returns true if the request's "X-Requested-With" header contains
     # "XMLHttpRequest". (The Prototype Javascript library sends this header with
     # every Ajax request.)