mirror of
https://github.com/Shopify/liquid.git
synced 2026-09-20 11:20:41 -07:00
Avoid calling line_number on String node when rescuing a render error.
This commit is contained in:
@@ -93,10 +93,11 @@ module Liquid
|
|||||||
rescue MemoryError => e
|
rescue MemoryError => e
|
||||||
raise e
|
raise e
|
||||||
rescue UndefinedVariable, UndefinedDropMethod, UndefinedFilter => e
|
rescue UndefinedVariable, UndefinedDropMethod, UndefinedFilter => e
|
||||||
context.handle_error(e, token.line_number, token.raw)
|
context.handle_error(e, token.line_number)
|
||||||
output << nil
|
output << nil
|
||||||
rescue ::StandardError => e
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ module Liquid
|
|||||||
@interrupts.pop
|
@interrupts.pop
|
||||||
end
|
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 = internal_error unless e.is_a?(Liquid::Error)
|
||||||
e.template_name ||= template_name
|
e.template_name ||= template_name
|
||||||
e.line_number ||= line_number
|
e.line_number ||= line_number
|
||||||
|
|||||||
Reference in New Issue
Block a user