aboutsummaryrefslogtreecommitdiff
path: root/plugins/date.rb
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/date.rb')
-rw-r--r--plugins/date.rb8
1 files changed, 4 insertions, 4 deletions
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