From 52f911964577623b2091d306957397ef3b8ccf2d Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Sat, 21 Jun 2014 10:34:55 -0500 Subject: Initial update to be compatible with Jekyll 2 --- plugins/date.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/date.rb') diff --git a/plugins/date.rb b/plugins/date.rb index 01d94737..031e6736 100644 --- a/plugins/date.rb +++ b/plugins/date.rb @@ -63,8 +63,8 @@ module Jekyll # Convert this Convertible's data to a Hash suitable for use by Liquid. # Overrides the default return data and adds any date-specific liquid attributes alias :super_to_liquid :to_liquid - def to_liquid - super_to_liquid.deep_merge(liquid_date_attributes) + def to_liquid(attrs = nil) + Utils.deep_merge_hashes super_to_liquid(attrs), liquid_date_attributes end end @@ -74,8 +74,8 @@ module Jekyll # Convert this Convertible's data to a Hash suitable for use by Liquid. # Overrides the default return data and adds any date-specific liquid attributes alias :super_to_liquid :to_liquid - def to_liquid - super_to_liquid.deep_merge(liquid_date_attributes) + def to_liquid(attrs = nil) + Utils.deep_merge_hashes super_to_liquid(attrs), liquid_date_attributes end end end -- cgit v1.2.1