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

simplify relative permalink deprecation

This commit is contained in:
maul.esel 2013-10-17 12:06:21 +02:00
parent 61e6a834cb
commit 7232948b62
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jekyll/site.rb
View File

@ -231,13 +231,14 @@ module Jekyll
# #
# Returns nothing. # Returns nothing.
def render def render
relative_permalinks_deprecation_method
payload = site_payload payload = site_payload
self.posts.each do |post| self.posts.each do |post|
post.render(self.layouts, payload) post.render(self.layouts, payload)
end end
self.pages.each do |page| self.pages.each do |page|
relative_permalinks_deprecation_method if page.uses_relative_permalinks
page.render(self.layouts, payload) page.render(self.layouts, payload)
end end
@ -389,7 +390,7 @@ module Jekyll
end end
def relative_permalinks_deprecation_method def relative_permalinks_deprecation_method
if config['relative_permalinks'] && !@deprecated_relative_permalinks if config['relative_permalinks'] && self.pages.any? { |page| page.uses_relative_permalinks }
$stderr.puts # Places newline after "Generating..." $stderr.puts # Places newline after "Generating..."
Jekyll.logger.warn "Deprecation:", "Starting in 1.1, permalinks for pages" + Jekyll.logger.warn "Deprecation:", "Starting in 1.1, permalinks for pages" +
" in subfolders must be relative to the" + " in subfolders must be relative to the" +
@ -397,7 +398,6 @@ module Jekyll
" directory. Check http://jekyllrb.com/docs/upgrading/"+ " directory. Check http://jekyllrb.com/docs/upgrading/"+
" for more info." " for more info."
$stderr.print Jekyll.logger.formatted_topic("") + "..." # for "done." $stderr.print Jekyll.logger.formatted_topic("") + "..." # for "done."
@deprecated_relative_permalinks = true
end end
end end