diff options
| author | David A. Cuadrado <krawek@gmail.com> | 2008-04-04 16:53:54 -0500 |
|---|---|---|
| committer | David A. Cuadrado <krawek@gmail.com> | 2008-04-04 16:53:54 -0500 |
| commit | 91b62bc75699f15f9ba5b0210ed7e7cff1969b95 (patch) | |
| tree | 18e62ddfc51f3064a3b0252f3f3b0888226ae9fe /app/helpers/blobs_helper.rb | |
| parent | 708aef7b5f4b007a17b28d7753f9be588c665b4a (diff) | |
| parent | 5b9a1d6781613e3420575b3440e7ffe92cbb5c8f (diff) | |
| download | gitorious-mainline-outdated-91b62bc75699f15f9ba5b0210ed7e7cff1969b95.zip gitorious-mainline-outdated-91b62bc75699f15f9ba5b0210ed7e7cff1969b95.tar.gz gitorious-mainline-outdated-91b62bc75699f15f9ba5b0210ed7e7cff1969b95.tar.bz2 | |
Merge branch 'master' into events
Conflicts:
app/controllers/merge_requests_controller.rb
app/controllers/users_controller.rb
Diffstat (limited to 'app/helpers/blobs_helper.rb')
| -rw-r--r-- | app/helpers/blobs_helper.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/blobs_helper.rb b/app/helpers/blobs_helper.rb index 34e6c05..64c2687 100644 --- a/app/helpers/blobs_helper.rb +++ b/app/helpers/blobs_helper.rb @@ -21,7 +21,15 @@ module BlobsHelper def render_highlighted(text, filename, theme = "idle") syntax_name = Uv.syntax_names_for_data(filename, text).first #TODO: render a choice select box if > 1 - highlighted = Uv.parse(text, "xhtml", syntax_name, false, theme) + begin + highlighted = Uv.parse(text, "xhtml", syntax_name, false, theme) + rescue => e + if e.to_s =~ /Oniguruma Error/ + highlighted = text + else + raise e + end + end line_numbers_for(highlighted, theme) end |