dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix error for case with broken encoding

This commit is contained in:
stereobooster 2012-07-16 12:15:32 +03:00
parent 2dbce8ca9f
commit a5a6900948
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jekyll/convertible.rb
View File

@ -25,14 +25,16 @@ module Jekyll
# #
# Returns nothing. # Returns nothing.
def read_yaml(base, name) def read_yaml(base, name)
begin
self.content = File.read(File.join(base, name)) self.content = File.read(File.join(base, name))
begin
if self.content =~ /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m if self.content =~ /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
self.content = $POSTMATCH self.content = $POSTMATCH
self.data = YAML.load($1) self.data = YAML.load($1)
end end
rescue Exception => e rescue => e
puts "Error reading file #{name}: #{e.message}"
rescue SyntaxError => e
puts "YAML Exception reading #{name}: #{e.message}" puts "YAML Exception reading #{name}: #{e.message}"
end end