diff options
| author | Brandon Mathis <brandon@imathis.com> | 2014-06-21 13:55:43 -0500 |
|---|---|---|
| committer | Brandon Mathis <brandon@imathis.com> | 2014-06-21 13:55:43 -0500 |
| commit | 72ea6042e33f0b92e4923c3af00e923f19472573 (patch) | |
| tree | 9d2fb6c30bc8463a8553f4c1962d9b3295e96559 /plugins/date.rb | |
| parent | 695fe922a9c25d3f41fddccf9d2e4ba2fc02ef52 (diff) | |
| parent | 06c04397053e46fe02fcecce589a2de76d21e160 (diff) | |
| download | my_new_personal_website-72ea6042e33f0b92e4923c3af00e923f19472573.tar.xz my_new_personal_website-72ea6042e33f0b92e4923c3af00e923f19472573.zip | |
Merge pull request #1589 from imathis/jekyll-2
Jekyll 2.0 compatability
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 |