Fixes #22 deep_merge => Utils.deep_merge_hashes

Fixes Jekyll 2.0 compatibility What I've learned today: Other people's monkey patches will change on you.
moshen · May 22, 2014 · d8c2211 · d8c2211
1 parent 647f436
commit d8c2211
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/asset_bundler.rb b/asset_bundler.rb
@@ -156,7 +156,8 @@ def self.config(context)
       if @@current_config.nil?
         ret_config = nil
         if context.registers[:site].config.key?("asset_bundler")
-          ret_config = @@default_config.deep_merge(context.registers[:site].config["asset_bundler"])
+          ret_config = Utils.deep_merge_hashes(@@default_config,
+                                               context.registers[:site].config["asset_bundler"])
 
           ret_config['markup_templates'].keys.each {|k|
             if !ret_config['markup_templates'][k].instance_of?(Liquid::Template)