From cf5dba2beb876cf17442d6c838b7eeb8d7c83a05 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 18 Dec 2011 08:40:04 +0000 Subject: [PATCH] Check that controller and request methods are available. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8276 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/hook.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/redmine/hook.rb b/lib/redmine/hook.rb index 5146ccbb8..dba36a91a 100644 --- a/lib/redmine/hook.rb +++ b/lib/redmine/hook.rb @@ -140,7 +140,9 @@ module Redmine default_context = {:controller => self, :project => @project, :request => request} Redmine::Hook.call_hook(hook, default_context.merge(context)) else - default_context = {:controller => controller, :project => @project, :request => request} + default_context = { :project => @project } + default_context[:controller] = controller if respond_to?(:controller) + default_context[:request] = request if respond_to?(:request) Redmine::Hook.call_hook(hook, default_context.merge(context)).join(' ') end end -- 2.39.5