diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-10-19 17:30:28 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-10-19 17:30:28 +0000 |
| commit | 7356e18d36a6501ff0bce2434a5162f7a47ecb1a (patch) | |
| tree | 38df264da7d39e97b8a7155a4eaffec34d217344 | |
| parent | 7d558120d3cf4896474f05d4e840c93b722e2a0c (diff) | |
| download | redmine-7356e18d36a6501ff0bce2434a5162f7a47ecb1a.tar.gz redmine-7356e18d36a6501ff0bce2434a5162f7a47ecb1a.zip | |
Include helper instead of patching (#20508).
git-svn-id: http://svn.redmine.org/redmine/trunk@14693 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/application_controller.rb | 1 | ||||
| -rw-r--r-- | app/helpers/application_helper.rb | 1 | ||||
| -rw-r--r-- | lib/redmine/hook.rb | 3 |
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) |