lib/jekyll/page.rb in jekyll-3.0.0.pre.beta2 vs lib/jekyll/page.rb in jekyll-3.0.0.pre.beta3

@@ -50,15 +50,11 @@
     # body.
     #
     # Returns the String permalink or nil if none has been set.
     def permalink
       return nil if data.nil? || data['permalink'].nil?
-      if site.config['relative_permalinks']
-        File.join(@dir, data['permalink'])
-      else
-        data['permalink']
-      end
+      data['permalink']
     end
 
     # The template of the permalink.
     #
     # Returns the template String.
@@ -153,12 +149,8 @@
     end
 
     # Returns the Boolean of whether this Page is an index file or not.
     def index?
       basename == 'index'
-    end
-
-    def uses_relative_permalinks
-      permalink && !@dir.empty? && site.config['relative_permalinks']
     end
   end
 end