Permalink
Browse files

Merge remote-tracking branch 'zenspider/master' into devel

  • Loading branch information...
mojombo committed Mar 11, 2011
2 parents f82c51d + bd01e64 commit 5f4dfe388f0fdbc9b487bf9742b9690a15c7b9e8
Showing with 3 additions and 1 deletion.
  1. +3 −1 lib/jekyll/convertible.rb
@@ -1,3 +1,5 @@
+require "English"
+
# Convertible provides methods for converting a pagelike item
# from a certain type of markup into actual content
#
@@ -24,7 +26,7 @@ def read_yaml(base, name)
self.content = File.read(File.join(base, name))
if self.content =~ /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
- self.content = self.content[($1.size + $2.size)..-1]
+ self.content = $POSTMATCH
begin
self.data = YAML.load($1)

0 comments on commit 5f4dfe3

Please sign in to comment.