summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2008-11-06 05:37:29 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2008-11-06 05:37:29 +0000
commit8b3a8ac1b47896598b060522d2d37b9bd4458d08 (patch)
tree4a70b9e2c276603f1860b989913535f536c4ebe3
parentb1cb9cd3bde906602e42a3460e1cfbcc10380b8c (diff)
downloadredmine-8b3a8ac1b47896598b060522d2d37b9bd4458d08.tar.gz
redmine-8b3a8ac1b47896598b060522d2d37b9bd4458d08.zip
Included Redmine::Hook::Helper to ActionController::Base so call_hook
is available in all controllers. #2111 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1979 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--lib/redmine/hook.rb1
-rw-r--r--test/functional/application_controller_test.rb4
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/redmine/hook.rb b/lib/redmine/hook.rb
index 9bf92b3e7..80e8d5259 100644
--- a/lib/redmine/hook.rb
+++ b/lib/redmine/hook.rb
@@ -107,3 +107,4 @@ module Redmine
end
ApplicationHelper.send(:include, Redmine::Hook::Helper)
+ActionController::Base.send(:include, Redmine::Hook::Helper)
diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index 6fcf8fe9a..7d1cc8391 100644
--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
@@ -37,4 +37,8 @@ class ApplicationControllerTest < Test::Unit::TestCase
end
set_language_if_valid('en')
end
+
+ def test_call_hook_mixed_in
+ assert @controller.respond_to?(:call_hook)
+ end
end