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

jekyll · Mar 11, 2011 · 5f4dfe3 · 5f4dfe3
2 parents f82c51d + bd01e64
commit 5f4dfe3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/jekyll/convertible.rb b/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)