diff options
| author | Luca Guidi <guidi.luca@gmail.com> | 2008-10-31 17:28:16 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-01 15:04:08 +0100 |
| commit | 5229fc4cc034ac5f565d143f5fd59ac11ebdc8e3 (patch) | |
| tree | 42d56096e958a63b5f3b053970dc112a56914bb1 /actionpack/lib | |
| parent | 5110a8e05b760524108bbb387e55c998c0274870 (diff) | |
| download | rails-5229fc4cc034ac5f565d143f5fd59ac11ebdc8e3.tar.gz rails-5229fc4cc034ac5f565d143f5fd59ac11ebdc8e3.tar.bz2 rails-5229fc4cc034ac5f565d143f5fd59ac11ebdc8e3.zip | |
Make sure habtm use class variable to list association valid keys
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1310 state:committed]
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index b00cfda042..6756ddd0a4 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1227,7 +1227,8 @@ module ActionController #:nodoc: if logger && logger.info? logger.info "\n\nProcessing #{self.class.name}\##{action_name} (for #{request_origin}) [#{request.method.to_s.upcase}]" - if @_session && @_session.respond_to?(:session_id) && !@_session.dbman.is_a?(CGI::Session::CookieStore) + if @_session && @_session.respond_to?(:session_id) && + !(@_session.respond_to?(:dbman) && @_session.is_a?(CGI::Session::CookieStore)) logger.info " Session ID: #{@_session.session_id}" end |