##// END OF EJS Templates
Reverts r14510 (#20508) and r14511 (#20507), tests broken....
Jean-Philippe Lang -
r14138:a19f6fb5003c
parent child
Show More
@@ -125,11 +125,11 module Redmine
125 end
125 end
126 end
126 end
127 end
127 end
128
128
129 def controller
129 def controller
130 nil
130 nil
131 end
131 end
132
132
133 def config
133 def config
134 ActionController::Base.config
134 ActionController::Base.config
135 end
135 end
@@ -171,5 +171,5 module Redmine
171 end
171 end
172 end
172 end
173
173
174 ActionView::Base.send(:include, Redmine::Hook::Helper)
174 ApplicationHelper.send(:include, Redmine::Hook::Helper)
175 ActionController::Base.send(:include, Redmine::Hook::Helper)
175 ActionController::Base.send(:include, Redmine::Hook::Helper)
@@ -126,7 +126,7 module Redmine
126 end
126 end
127 end
127 end
128
128
129 module ThemesHelper
129 module ApplicationHelper
130 def current_theme
130 def current_theme
131 unless instance_variable_defined?(:@current_theme)
131 unless instance_variable_defined?(:@current_theme)
132 @current_theme = Redmine::Themes.theme(Setting.ui_theme)
132 @current_theme = Redmine::Themes.theme(Setting.ui_theme)
@@ -141,4 +141,3 module ThemesHelper
141 end
141 end
142 end
142 end
143 end
143 end
144 ActionView::Base.send(:include, ThemesHelper)
General Comments 0
You need to be logged in to leave comments. Login now