Merge pull request #1611 from middleman/Arcovion-patch-2

Fix frontmatter regex
2015-09-30 08:17:18 +01:00 · 2015-09-30 08:17:18 +01:00 · 9686c1ec7a
commit 9686c1ec7a
parent 9df1a45301 b389c26b4e
1 changed files with 3 additions and 3 deletions
--- a/middleman-core/lib/middleman-core/util/data.rb
+++ b/middleman-core/lib/middleman-core/util/data.rb
@ -24,10 +24,10 @@ module Middleman::Util::Data
    end

    /
-      \A(.*?coding:.*?\r?\n)?
-      (?<start>[-;]{3})[ ]*\r?\n
+      \A(?:[^\r\n]*coding:[^\r\n]*\r?\n)?
+      (?<start>---|;;;)[ ]*\r?\n
      (?<frontmatter>.*?)[ ]*\r?\n?
-      (?<stop>^[-.;]{3})[ ]*\r?\n?
+      ^(?<stop>---|\.\.\.|;;;)[ ]*\r?\n?
      \r?\n?
      (?<additional_content>.*)
    /mx =~ content