From 9d44d3290b95473516c398f48f4e176d228e2d6e Mon Sep 17 00:00:00 2001
From: "maul.esel" <maul.esel@go4more.de>
Date: Wed, 11 Sep 2013 00:55:57 +0200
Subject: [PATCH] make frontmatter defaults available to liquid

---
 lib/jekyll/convertible.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb
index 5f493800..4e1cdf15 100644
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -13,6 +13,7 @@ require 'set'
 #   self.ext=
 #   self.output=
 #   self.name
+#   self.type -> :page, :post or :draft
 module Jekyll
   module Convertible
     # Returns the contents as a String.
@@ -91,7 +92,8 @@ module Jekyll
       further_data = Hash[(attrs || self.class::ATTRIBUTES_FOR_LIQUID).map { |attribute|
         [attribute, send(attribute)]
       }]
-      data.deep_merge(further_data)
+      defaults = site.frontmatter_defaults.all(self.path, self.type)
+      defaults.merge(data).deep_merge(further_data)
     end
 
     # Recursively render layouts