From 6311ade82708b63b83d30278a1af4c05af4aee6e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 23 Dec 2013 12:39:18 +0000 Subject: [PATCH] Rescue syntax highlighter exceptions. git-svn-id: http://svn.redmine.org/redmine/trunk@12451 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/syntax_highlighting.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/redmine/syntax_highlighting.rb b/lib/redmine/syntax_highlighting.rb index a1f94a175..b388262c3 100644 --- a/lib/redmine/syntax_highlighting.rb +++ b/lib/redmine/syntax_highlighting.rb @@ -20,7 +20,6 @@ module Redmine class << self attr_reader :highlighter - delegate :highlight_by_filename, :highlight_by_language, :to => :highlighter def highlighter=(name) if name.is_a?(Module) @@ -29,6 +28,18 @@ module Redmine @highlighter = const_get(name) end end + + def highlight_by_filename(text, filename) + highlighter.highlight_by_filename(text, filename) + rescue + ERB::Util.h(text) + end + + def highlight_by_language(text, language) + highlighter.highlight_by_language(text, language) + rescue + ERB::Util.h(text) + end end module CodeRay