From 137ce94d237630d423c4d76d62b47c2f905977bf Mon Sep 17 00:00:00 2001 From: Ben Hollis Date: Tue, 5 Feb 2013 23:34:18 -0800 Subject: [PATCH] Restore indifferent-access behavior to page data and fix broken caching --- .../middleman-core/core_extensions/front_matter.rb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb index 3d7a5b49..d4cd009e 100644 --- a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb +++ b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb @@ -40,7 +40,7 @@ module Middleman::CoreExtensions data[opt] = fmdata[opt] unless fmdata[opt].nil? end - { :options => data, :page => fmdata } + { :options => data, :page => ::Middleman::Util.recursively_enhance(fmdata).freeze } end end end @@ -199,15 +199,8 @@ module Middleman::CoreExtensions end def data - @_last_raw ||= nil - @_last_enhanced ||= nil - - if @_last_raw != raw_data - @_last_raw == raw_data - @_last_enhanced = ::Middleman::Util.recursively_enhance(raw_data).freeze - end + ::Middleman::Util.recursively_enhance(raw_data).freeze end - end module InstanceMethods