aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDmitry Vorotilin <d.vorotilin@gmail.com>2012-06-05 11:03:00 +0400
committerDmitry Vorotilin <d.vorotilin@gmail.com>2012-06-05 11:03:00 +0400
commitccaf982ad8e2b9859d398387e483901f60fedd69 (patch)
treeefd095ec839d5c00fc1329d84e6293d54b25f296 /actionpack
parentd10eb699649f9d7fa7e51ae1b633545d6a55e1ad (diff)
downloadrails-ccaf982ad8e2b9859d398387e483901f60fedd69.tar.gz
rails-ccaf982ad8e2b9859d398387e483901f60fedd69.tar.bz2
rails-ccaf982ad8e2b9859d398387e483901f60fedd69.zip
Metal controller doesn't have logger method, check it and then delegate
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/controller_helper.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/controller_helper.rb b/actionpack/lib/action_view/helpers/controller_helper.rb
index 1a583e62ae..0c3806a78c 100644
--- a/actionpack/lib/action_view/helpers/controller_helper.rb
+++ b/actionpack/lib/action_view/helpers/controller_helper.rb
@@ -10,14 +10,20 @@ module ActionView
delegate :request_forgery_protection_token, :params, :session, :cookies, :response, :headers,
:flash, :action_name, :controller_name, :controller_path, :to => :controller
- delegate :logger, :to => :controller, :allow_nil => true
-
def assign_controller(controller)
if @_controller = controller
@_request = controller.request if controller.respond_to?(:request)
@_config = controller.config.inheritable_copy if controller.respond_to?(:config)
end
end
+
+ def logger
+ if controller.respond_to?(:logger)
+ controller.logger
+ else
+ nil
+ end
+ end
end
end
end