From a19f6fb5003c0fe97e25e4d24418e4f50458bd77 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 22 Aug 2015 11:49:12 +0000 Subject: Reverts r14510 (#20508) and r14511 (#20507), tests broken. git-svn-id: http://svn.redmine.org/redmine/trunk@14520 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/hook.rb | 6 +++--- lib/redmine/themes.rb | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'lib/redmine') diff --git a/lib/redmine/hook.rb b/lib/redmine/hook.rb index 419b75e25..7f518d8d4 100644 --- a/lib/redmine/hook.rb +++ b/lib/redmine/hook.rb @@ -125,11 +125,11 @@ module Redmine end end end - + def controller nil end - + def config ActionController::Base.config end @@ -171,5 +171,5 @@ module Redmine end end -ActionView::Base.send(:include, Redmine::Hook::Helper) +ApplicationHelper.send(:include, Redmine::Hook::Helper) ActionController::Base.send(:include, Redmine::Hook::Helper) diff --git a/lib/redmine/themes.rb b/lib/redmine/themes.rb index 0381f26f7..a9a59bb8e 100644 --- a/lib/redmine/themes.rb +++ b/lib/redmine/themes.rb @@ -126,7 +126,7 @@ module Redmine end end -module ThemesHelper +module ApplicationHelper def current_theme unless instance_variable_defined?(:@current_theme) @current_theme = Redmine::Themes.theme(Setting.ui_theme) @@ -141,4 +141,3 @@ module ThemesHelper end end end -ActionView::Base.send(:include, ThemesHelper) -- cgit v1.2.3