lib/jekyll/readers/layout_reader.rb in jekyll-3.10.0 vs lib/jekyll/readers/layout_reader.rb in jekyll-4.0.0.pre.alpha1

@@ -21,11 +21,11 @@
 
       @layouts
     end
 
     def layout_directory
-      @layout_directory ||= (layout_directory_in_cwd || layout_directory_inside_source)
+      @layout_directory ||= site.in_source_dir(site.config["layouts_dir"])
     end
 
     def theme_layout_directory
       @theme_layout_directory ||= site.theme.layouts_path if site.theme
     end
@@ -52,20 +52,10 @@
       file.split(".")[0..-2].join(".")
     end
 
     def within(directory)
       return unless File.exist?(directory)
-      Dir.chdir(directory) { yield }
-    end
 
-    def layout_directory_inside_source
-      site.in_source_dir(site.config["layouts_dir"])
-    end
-
-    def layout_directory_in_cwd
-      dir = Jekyll.sanitized_path(Dir.pwd, site.config["layouts_dir"])
-      if File.directory?(dir) && !site.safe
-        dir
-      end
+      Dir.chdir(directory) { yield }
     end
   end
 end