summaryrefslogtreecommitdiffstats
path: root/lib/redmine/themes.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-08-18 06:59:24 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-08-18 06:59:24 +0000
commitd00c5f06d9060b73bbbed0ad5cd28869b0ea06c3 (patch)
tree89d8c0a322b515d689a498ff4d50a10fb030ab75 /lib/redmine/themes.rb
parent5626ee94ed8a144a423e5a7a3714176ed58014ba (diff)
downloadredmine-d00c5f06d9060b73bbbed0ad5cd28869b0ea06c3.tar.gz
redmine-d00c5f06d9060b73bbbed0ad5cd28869b0ea06c3.zip
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
Diffstat (limited to 'lib/redmine/themes.rb')
-rw-r--r--lib/redmine/themes.rb3
1 files changed, 2 insertions, 1 deletions
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)