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

New liquid tracking.

Browse Source
This commit is contained in:
Mike Angell
2019-09-24 05:19:48 +10:00
parent f4d134cd5c
commit 9a9564499a
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/liquid/context.rb
View File

@@ -219,12 +219,16 @@ module Liquid
def try_variable_find_in_environments(key, raise_on_not_found:)
@environments.each do |environment|
found_variable = lookup_and_evaluate(environment, key, raise_on_not_found: raise_on_not_found)
Usage.increment("environment_has_a_default_proc") if environment.default_proc
Usage.increment("environment_has_key_but_is_nil") if environment.key?(key) && found_variable == nil
if !found_variable.nil? || @strict_variables && raise_on_not_found
return found_variable
end
end
@static_environments.each do |environment|
found_variable = lookup_and_evaluate(environment, key, raise_on_not_found: raise_on_not_found)
Usage.increment("static_environment_has_a_default_proc") if environment.default_proc
Usage.increment("static_environment_has_key_but_is_nil") if environment.key?(key) && found_variable == nil
if !found_variable.nil? || @strict_variables && raise_on_not_found
return found_variable
end

1
lib/liquid/standardfilters.rb
View File

@@ -423,7 +423,6 @@ module Liquid
def default(input, default_value = '')
if !input || input.respond_to?(:empty?) && input.empty?
Usage.increment("default_filter_received_false_value") if input == false # See https://github.com/Shopify/liquid/issues/1127
default_value
else
input