Rails3: prevent double rendering file view and annotate on Rails 3.0.11 and Rails 3.1.3

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8988 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA committed 2012-02-25 06:01:48 +00:00
1 parent b7ead65fde
commit b4630c03f7
3 files changed
+10 -4

No files matched your search

+6
View File
@@ -355,6 +355,12 @@ module ApplicationHelper
end
end
def syntax_highlight_lines(name, content)
lines = []
syntax_highlight(name, content).each_line { |line| lines << line }
lines
end
def syntax_highlight(name, content)
Redmine::SyntaxHighlighting.highlight_by_filename(content, name)
end