summaryrefslogtreecommitdiffstats
path: root/lib/redmine/wiki_formatting
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-03-14 12:57:08 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-03-14 12:57:08 +0000
commitc03b4c2e1e88f4fd1257d9519144905f08718dcd (patch)
treea096876bd8594a11fad1adf06888dd5aaf1b0838 /lib/redmine/wiki_formatting
parent51d790b2f32c5b02b6f322b2b0b1b7cc7ce9644b (diff)
downloadredmine-c03b4c2e1e88f4fd1257d9519144905f08718dcd.tar.gz
redmine-c03b4c2e1e88f4fd1257d9519144905f08718dcd.zip
Extract CodeRay calls to Redmine::SyntaxHighlighting (#2985).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3584 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/wiki_formatting')
-rw-r--r--lib/redmine/wiki_formatting/textile/formatter.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/redmine/wiki_formatting/textile/formatter.rb b/lib/redmine/wiki_formatting/textile/formatter.rb
index 2010986f5..65c1d01a6 100644
--- a/lib/redmine/wiki_formatting/textile/formatter.rb
+++ b/lib/redmine/wiki_formatting/textile/formatter.rb
@@ -16,7 +16,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require 'redcloth3'
-require 'coderay'
module Redmine
module WikiFormatting
@@ -54,7 +53,7 @@ module Redmine
content = @pre_list[$1.to_i]
if content.match(/<code\s+class="(\w+)">\s?(.+)/m)
content = "<code class=\"#{$1} CodeRay\">" +
- CodeRay.scan($2, $1.downcase).html(:line_numbers => :inline)
+ Redmine::SyntaxHighlighting.highlight_by_language($2, $1)
end
content
end