From 05e8deae8dba106475fe596eabb05ebcbdedca68 Mon Sep 17 00:00:00 2001
From: Martin Vilcans <martin@librador.com>
Date: Mon, 15 Jun 2009 23:46:16 +0200
Subject: [PATCH] Make configuration accessible from page.

For example, if you have the following in _config.yml:

  url: http://www.librador.com

...you can have the following in an HTML page:

  <a href="{{site.url}}">Home!</a>

This is a reapply of change 7b449239f0908e34f0290c213970e4b14ba2c2df on latest HEAD.

Signed-off-by: Nick Quaranto <nick@quaran.to>
---
 lib/jekyll/site.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index e74fd333..932ea01c 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -221,11 +221,11 @@ module Jekyll
     #                     "posts" => [<Post>],
     #                     "categories" => [<Post>]}
     def site_payload
-      {"site" => {
+      {"site" => self.config.merge({
           "time"       => Time.now,
           "posts"      => self.posts.sort { |a,b| b <=> a },
           "categories" => post_attr_hash('categories'),
-          "tags"       => post_attr_hash('tags')}}
+          "tags"       => post_attr_hash('tags')})}
     end
 
     # Filter out any files/directories that are hidden or backup files (start