kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-04 17:25:41 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid calling line_number on String node when rescuing a render error.

Browse Source
This commit is contained in:
Dylan Thacker-Smith
2017-02-07 15:34:10 -05:00
parent 25c7b05916
commit 5dcefd7d77
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/liquid/block_body.rb
View File

@@ -93,10 +93,11 @@ module Liquid
rescue MemoryError => e
raise e
rescue UndefinedVariable, UndefinedDropMethod, UndefinedFilter => e
context.handle_error(e, token.line_number, token.raw)
context.handle_error(e, token.line_number)
output << nil
rescue ::StandardError => e
output << context.handle_error(e, token.line_number, token.raw)
line_number = token.is_a?(String) ? nil : token.line_number
output << context.handle_error(e, line_number)
end
end

2
lib/liquid/context.rb
View File

@@ -74,7 +74,7 @@ module Liquid
@interrupts.pop
end
def handle_error(e, line_number = nil, raw_token = nil)
def handle_error(e, line_number = nil)
e = internal_error unless e.is_a?(Liquid::Error)
e.template_name ||= template_name
e.line_number ||= line_number