comparison lib/redmine/syntax_highlighting.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

 module Redmine
   module SyntaxHighlighting
 
     class << self
       attr_reader :highlighter
-      delegate :highlight_by_filename, :highlight_by_language, :to => :highlighter
 
       def highlighter=(name)
         if name.is_a?(Module)
           @highlighter = name
         else
           @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
       require 'coderay'