Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-06 05:16:12 +01:00
Code Issues Packages Projects Releases Activity

Reverts r14510 (#20508) and r14511 (#20507), tests broken.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14520 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-08-22 11:49:12 +00:00
parent 1a630c5581
commit a19f6fb500
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redmine/hook.rb
View File

@@ -171,5 +171,5 @@ module Redmine
end end
end end
ActionView::Base.send(:include, Redmine::Hook::Helper) ApplicationHelper.send(:include, Redmine::Hook::Helper)
ActionController::Base.send(:include, Redmine::Hook::Helper) ActionController::Base.send(:include, Redmine::Hook::Helper)

3
lib/redmine/themes.rb
View File

@@ -126,7 +126,7 @@ module Redmine
end end
end end
module ThemesHelper module ApplicationHelper
def current_theme def current_theme
unless instance_variable_defined?(:@current_theme) unless instance_variable_defined?(:@current_theme)
@current_theme = Redmine::Themes.theme(Setting.ui_theme) @current_theme = Redmine::Themes.theme(Setting.ui_theme)
@@ -141,4 +141,3 @@ module ThemesHelper
end end
end end
end end
ActionView::Base.send(:include, ThemesHelper)