ThemesHelper reopening ApplicationHelper is problem with autoloading (#20507).

Patch by Ondřej Ezr.

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

diff --git a/lib/redmine/themes.rb b/lib/redmine/themes.rb
index a9a59bb8e1e69b40d90daa80bc508328e13361b6..0381f26f7a0dcafc958e936159462a932236f995 100644 (file)
--- a/lib/redmine/themes.rb
+++ b/lib/redmine/themes.rb
@@ -126,7 +126,7 @@ module Redmine
   end
 end
 
-module ApplicationHelper
+module ThemesHelper
   def current_theme
     unless instance_variable_defined?(:@current_theme)
       @current_theme = Redmine::Themes.theme(Setting.ui_theme)
@@ -141,3 +141,4 @@ module ApplicationHelper
     end
   end
 end
+ActionView::Base.send(:include, ThemesHelper)