diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2009-05-21 02:55:25 +0200 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-21 02:55:25 +0200 |
commit | e21d1614bb9006e69bf4bb2467b823aa12e64485 (patch) | |
tree | b20697a90e50c57a02d56f99dbf95300ca828325 /actionpack/lib/action_controller/base/verification.rb | |
parent | 7f7fdc407a90c9ce75ce0a77bc0f631115514d2f (diff) | |
download | rails-e21d1614bb9006e69bf4bb2467b823aa12e64485.tar.gz rails-e21d1614bb9006e69bf4bb2467b823aa12e64485.tar.bz2 rails-e21d1614bb9006e69bf4bb2467b823aa12e64485.zip |
Made ActionController::Verification work with new_base
Diffstat (limited to 'actionpack/lib/action_controller/base/verification.rb')
-rw-r--r-- | actionpack/lib/action_controller/base/verification.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/base/verification.rb b/actionpack/lib/action_controller/base/verification.rb index c62b81b666..a513e9f40c 100644 --- a/actionpack/lib/action_controller/base/verification.rb +++ b/actionpack/lib/action_controller/base/verification.rb @@ -1,7 +1,13 @@ module ActionController #:nodoc: module Verification #:nodoc: - def self.included(base) #:nodoc: - base.extend(ClassMethods) + extend ActiveSupport::DependencyModule + + # TODO : Remove the defined? check when new base is the main base + if defined?(ActionController::Http) + depends_on AbstractController::Callbacks + depends_on Session + depends_on Flash + depends_on Renderer end # This module provides a class-level method for specifying that certain @@ -102,7 +108,7 @@ module ActionController #:nodoc: end def verify_presence_of_keys_in_hash_flash_or_params(options) # :nodoc: - [*options[:params] ].find { |v| params[v].nil? } || + [*options[:params] ].find { |v| v && params[v.to_sym].nil? } || [*options[:session]].find { |v| session[v].nil? } || [*options[:flash] ].find { |v| flash[v].nil? } end |