From 5229fc4cc034ac5f565d143f5fd59ac11ebdc8e3 Mon Sep 17 00:00:00 2001 From: Luca Guidi Date: Fri, 31 Oct 2008 17:28:16 +0100 Subject: Make sure habtm use class variable to list association valid keys Signed-off-by: Michael Koziarski [#1310 state:committed] --- actionpack/lib/action_controller/base.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/base.rb') 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 -- cgit v1.2.3