summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/controllers/application_controller.rb1
-rw-r--r--app/helpers/application_helper.rb1
-rw-r--r--lib/redmine/hook.rb3
3 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9f307c3e2..4d9821c21 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -23,6 +23,7 @@ class Unauthorized < Exception; end
class ApplicationController < ActionController::Base
include Redmine::I18n
include Redmine::Pagination
+ include Redmine::Hook::Helper
include RoutesHelper
helper :routes
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 60aad08a2..9c9f29dea 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -26,6 +26,7 @@ module ApplicationHelper
include GravatarHelper::PublicMethods
include Redmine::Pagination::Helper
include Redmine::SudoMode::Helper
+ include Redmine::Hook::Helper
extend Forwardable
def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
diff --git a/lib/redmine/hook.rb b/lib/redmine/hook.rb
index 7f518d8d4..fc5692cab 100644
--- a/lib/redmine/hook.rb
+++ b/lib/redmine/hook.rb
@@ -170,6 +170,3 @@ module Redmine
end
end
end
-
-ApplicationHelper.send(:include, Redmine::Hook::Helper)
-ActionController::Base.send(:include, Redmine::Hook::Helper)