summaryrefslogtreecommitdiffstats
path: root/lib/redmine/themes.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-25 17:17:49 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-25 17:17:49 +0000
commit5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7 (patch)
tree93e57765139714bd82dede475725516c448c0d55 /lib/redmine/themes.rb
parent34e20c4373b7f5a20ab3a132feae3f70f21ec477 (diff)
downloadredmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.tar.gz
redmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.zip
Merged rails-3.2 branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/themes.rb')
-rw-r--r--lib/redmine/themes.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/redmine/themes.rb b/lib/redmine/themes.rb
index 71d237e67..51b974fd7 100644
--- a/lib/redmine/themes.rb
+++ b/lib/redmine/themes.rb
@@ -118,6 +118,14 @@ module ApplicationHelper
stylesheet_path source
end
+ def stylesheet_link_tag(source, *args)
+ if current_theme && current_theme.stylesheets.include?(source)
+ super current_theme.stylesheet_path(source), *args
+ else
+ super
+ end
+ end
+
# Returns the header tags for the current theme
def heads_for_theme
if current_theme && current_theme.javascripts.include?('theme')