summaryrefslogtreecommitdiffstats
path: root/app/helpers/application_helper.rb
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 /app/helpers/application_helper.rb
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 'app/helpers/application_helper.rb')
-rw-r--r--app/helpers/application_helper.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5663cc6d6..321d19007 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -15,8 +15,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-require 'coderay'
-require 'coderay/helpers/file_type'
require 'forwardable'
require 'cgi'
@@ -284,8 +282,7 @@ module ApplicationHelper
end
def syntax_highlight(name, content)
- type = CodeRay::FileType[name]
- type ? CodeRay.scan(content, type).html : h(content)
+ Redmine::SyntaxHighlighting.highlight_by_filename(content, name)
end
def to_path_param(path)