From 7232948b629a8800c463461210d683caa242e061 Mon Sep 17 00:00:00 2001
From: "maul.esel" <maul.esel@go4more.de>
Date: Thu, 17 Oct 2013 12:06:21 +0200
Subject: [PATCH 1/3] simplify relative permalink deprecation

---
 lib/jekyll/site.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 04fc77e1..3634082d 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -231,13 +231,14 @@ module Jekyll
     #
     # Returns nothing.
     def render
+      relative_permalinks_deprecation_method
+
       payload = site_payload
       self.posts.each do |post|
         post.render(self.layouts, payload)
       end
 
       self.pages.each do |page|
-        relative_permalinks_deprecation_method if page.uses_relative_permalinks
         page.render(self.layouts, payload)
       end
 
@@ -389,7 +390,7 @@ module Jekyll
     end
 
     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..."
         Jekyll.logger.warn "Deprecation:", "Starting in 1.1, permalinks for pages" +
                                             " in subfolders must be relative to the" +
@@ -397,7 +398,6 @@ module Jekyll
                                             " directory. Check http://jekyllrb.com/docs/upgrading/"+
                                             " for more info."
         $stderr.print Jekyll.logger.formatted_topic("") + "..." # for "done."
-        @deprecated_relative_permalinks = true
       end
     end
 

From f0aac3049149cc3df2022f6d3e02faebcb95a004 Mon Sep 17 00:00:00 2001
From: "maul.esel" <maul.esel@go4more.de>
Date: Thu, 17 Oct 2013 12:07:30 +0200
Subject: [PATCH 2/3] remove duplicated render code for posts and pages

---
 lib/jekyll/site.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 3634082d..2974fbd8 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -234,12 +234,8 @@ module Jekyll
       relative_permalinks_deprecation_method
 
       payload = site_payload
-      self.posts.each do |post|
-        post.render(self.layouts, payload)
-      end
-
-      self.pages.each do |page|
-        page.render(self.layouts, payload)
+      [self.posts, self.pages].flatten.each do |page_or_post|
+        page_or_post.render(self.layouts, payload)
       end
 
       self.categories.values.map { |ps| ps.sort! { |a, b| b <=> a } }

From c2aa26280c3960d2583538431d131a21944468f1 Mon Sep 17 00:00:00 2001
From: "maul.esel" <maul.esel@go4more.de>
Date: Thu, 17 Oct 2013 15:17:58 +0200
Subject: [PATCH 3/3] extract pages.any?... in own method

---
 lib/jekyll/site.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 2974fbd8..80cd7653 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -386,7 +386,7 @@ module Jekyll
     end
 
     def relative_permalinks_deprecation_method
-      if config['relative_permalinks'] && self.pages.any? { |page| page.uses_relative_permalinks }
+      if config['relative_permalinks'] && has_relative_page?
         $stderr.puts # Places newline after "Generating..."
         Jekyll.logger.warn "Deprecation:", "Starting in 1.1, permalinks for pages" +
                                             " in subfolders must be relative to the" +
@@ -407,6 +407,10 @@ module Jekyll
 
     private
 
+    def has_relative_page?
+      self.pages.any? { |page| page.uses_relative_permalinks }
+    end
+
     def has_yaml_header?(file)
       "---" == File.open(file) { |fd| fd.read(3) }
     end