sanitize urls and ignore symlinks

lib/jekyll/page.rb

@@ -55,9 +55,12 @@ module Jekyll
     #
     # Returns <String>
     def url
-      return permalink if permalink
+      return @url if @url
 
-      @url ||= {
+      url = if permalink
+        permalink
+      else
+        {
           "basename"   => self.basename,
           "output_ext" => self.output_ext,
         }.inject(template) { |result, token|
@@ -65,6 +68,12 @@ module Jekyll
         }.gsub(/\/\//, "/")
       end
 
+      # sanitize url
+      @url = url.split('/').reject{ |part| part =~ /^\.+$/ }.join('/')
+      @url += "/" if url =~ /\/$/
+      @url
+    end
+
     # Extract information from the page filename
     #   +name+ is the String filename of the page file
     #

lib/jekyll/post.rb

@@ -117,9 +117,12 @@ module Jekyll
     #
     # Returns <String>
     def url
-      return permalink if permalink
+      return @url if @url
 
-      @url ||= {
+      url = if permalink
+        permalink
+      else
+        {
           "year"       => date.strftime("%Y"),
           "month"      => date.strftime("%m"),
           "day"        => date.strftime("%d"),
@@ -133,6 +136,12 @@ module Jekyll
         }.gsub(/\/\//, "/")
       end
 
+      # sanitize url
+      @url = url.split('/').reject{ |part| part =~ /^\.+$/ }.join('/')
+      @url += "/" if url =~ /\/$/
+      @url
+    end
+
     # The UID for this post (useful in feeds)
     # e.g. /2008/11/05/my-awesome-post
     #

lib/jekyll/site.rb

@@ -210,7 +210,7 @@ module Jekyll
     # Returns nothing
     def read_directories(dir = '')
       base = File.join(self.source, dir)
-      entries = filter_entries(Dir.entries(base))
+      entries = Dir.chdir(base){ filter_entries(Dir['*']) }
 
       self.read_posts(dir)
 
@@ -268,7 +268,10 @@ module Jekyll
     def filter_entries(entries)
       entries = entries.reject do |e|
         unless ['.htaccess'].include?(e)
-          ['.', '_', '#'].include?(e[0..0]) || e[-1..-1] == '~' || self.exclude.include?(e)
+          ['.', '_', '#'].include?(e[0..0]) ||
+          e[-1..-1] == '~' ||
+          self.exclude.include?(e) ||
+          File.symlink?(e)
         end
       end
     end