Include helper instead of patching (#20508).

git-svn-id: http://svn.redmine.org/redmine/trunk@14693 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9f307c3e2d30b653b9b2f2c45846ce6531156646..4d9821c21e2cd5454d59c00be0a51f56ecaf53d8 100644 (file)
--- 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 60aad08a2993045dd5e903ed29984637c65ae7b2..9c9f29dea38a4c39316d2414b6d5fef3f86eccf7 100644 (file)
--- 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 7f518d8d4ab8b16bdec0be108cc8b4e59164eb5a..fc5692caba74c578da565b813cc445e0f0cae6de 100644 (file)
--- 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)