diff options
| author | Brandon Mathis <brandon@imathis.com> | 2014-06-21 10:34:55 -0500 |
|---|---|---|
| committer | Brandon Mathis <brandon@imathis.com> | 2014-06-21 10:34:55 -0500 |
| commit | 52f911964577623b2091d306957397ef3b8ccf2d (patch) | |
| tree | 346df9277c6c67b6afd7eddbe3cacaf2c96012e1 /plugins/date.rb | |
| parent | 695fe922a9c25d3f41fddccf9d2e4ba2fc02ef52 (diff) | |
| download | my_new_personal_website-52f911964577623b2091d306957397ef3b8ccf2d.tar.xz my_new_personal_website-52f911964577623b2091d306957397ef3b8ccf2d.zip | |
Initial update to be compatible with Jekyll 2
Diffstat (limited to 'plugins/date.rb')
| -rw-r--r-- | plugins/date.rb | 8 |
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 |