summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorEtienne Massip <etienne.massip@gmail.com>2012-04-12 17:54:55 +0000
committerEtienne Massip <etienne.massip@gmail.com>2012-04-12 17:54:55 +0000
commitdd8d8e0560d9bef18da084cd299be4b246f6ed61 (patch)
tree61087548688dabcc65f8f200193cd480745672d5 /lib
parentde0689d4f47ad06867b98c0253c80edb1f49e211 (diff)
downloadredmine-dd8d8e0560d9bef18da084cd299be4b246f6ed61.tar.gz
redmine-dd8d8e0560d9bef18da084cd299be4b246f6ed61.zip
Updated CodeRay to 1.0.6.
Fixed multiline comments highlighting issue in file view (#7495). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9389 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/syntax_highlighting.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/syntax_highlighting.rb b/lib/redmine/syntax_highlighting.rb
index 72a46ece5..e3e0d5f5f 100644
--- a/lib/redmine/syntax_highlighting.rb
+++ b/lib/redmine/syntax_highlighting.rb
@@ -40,7 +40,7 @@ module Redmine
# Should not return line numbers nor outer pre tag
def highlight_by_filename(text, filename)
language = ::CodeRay::FileType[filename]
- language ? ::CodeRay.scan(text, language).html : ERB::Util.h(text)
+ language ? ::CodeRay.scan(text, language).html(:break_lines => true) : ERB::Util.h(text)
end
# Highlights +text+ using +language+ syntax