The site configuration may not always provide a 'time' setting. Closes …

…jekyll#184. * This fixes a bug on Ruby 1.9.1 and 1.9.2 where Time.parse was being passed an emptry String, if the 'time' setting was not defined.
bryanjswift · Aug 24, 2010 · f4fb833 · f4fb833
1 parent d9bc00c
commit f4fb833
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/History.txt b/History.txt
@@ -1,6 +1,7 @@
 == HEAD
   * Bug Fixes
     * Highlight should not be able to render local files
+    * The site configuration may not always provide a 'time' setting (#184)
 
 == 0.6.2 / 2010-06-25
   * Bug Fixes

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
@@ -28,7 +28,11 @@ def initialize(config)
     end
 
     def reset
-      self.time            = Time.parse(self.config['time'].to_s) || Time.now
+      self.time            = if self.config['time']
+                               Time.parse(self.config['time'].to_s)
+                             else
+                               Time.now
+                             end
       self.layouts         = {}
       self.posts           = []
       self.pages           = []