From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 18 Aug 2015 06:59:24 +0000 (+0000)
Subject: ThemesHelper reopening ApplicationHelper is problem with autoloading (#20507).
X-Git-Tag: 3.2.0~271
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d00c5f06d9060b73bbbed0ad5cd28869b0ea06c3;p=redmine.git

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 a9a59bb8e..0381f26f7 100644
--- 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)