diff options
| author | David A. Cuadrado <krawek@gmail.com> | 2008-03-31 17:07:58 -0500 |
|---|---|---|
| committer | David A. Cuadrado <krawek@gmail.com> | 2008-03-31 17:07:58 -0500 |
| commit | 9a36808edb3390d6e7c04e7108a36dddff3e93cd (patch) | |
| tree | 7cc326f434895675c3d2820e8240aa925cba7a2b /app/helpers/blobs_helper.rb | |
| parent | ebad2ff1cd610b62206dd4c820271f4281c3d75f (diff) | |
| parent | e2c30db26d34c514b5c44193e6d491db9f07b6c7 (diff) | |
| download | gitorious-mainline-outdated-9a36808edb3390d6e7c04e7108a36dddff3e93cd.zip gitorious-mainline-outdated-9a36808edb3390d6e7c04e7108a36dddff3e93cd.tar.gz gitorious-mainline-outdated-9a36808edb3390d6e7c04e7108a36dddff3e93cd.tar.bz2 | |
Merge branch 'master' of git://gitorious.org/gitorious/mainline
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 |