Rescue syntax highlighter exceptions.

git-svn-id: http://svn.redmine.org/redmine/trunk@12451 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/syntax_highlighting.rb b/lib/redmine/syntax_highlighting.rb
index a1f94a175ee3053052a98cc12b234c44017766b8..b388262c3f5ccb92f1c7a5e4c29ea95ad3aba626 100644 (file)
--- 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