summaryrefslogtreecommitdiffstats
path: root/lib/redmine/themes.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-08-22 11:49:12 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-08-22 11:49:12 +0000
commita19f6fb5003c0fe97e25e4d24418e4f50458bd77 (patch)
tree216b93a3e87d842a05d185d82344254d406ad443 /lib/redmine/themes.rb
parent1a630c5581982ec13b6044733147ac56f9814a07 (diff)
downloadredmine-a19f6fb5003c0fe97e25e4d24418e4f50458bd77.tar.gz
redmine-a19f6fb5003c0fe97e25e4d24418e4f50458bd77.zip
Reverts r14510 (#20508) and r14511 (#20507), tests broken.
git-svn-id: http://svn.redmine.org/redmine/trunk@14520 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/themes.rb')
-rw-r--r--lib/redmine/themes.rb3
1 files changed, 1 insertions, 2 deletions
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)