From 323d14845fa7128fad83536ddd891ee2c6768673 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Mon, 6 Jan 2014 22:23:51 -0500 Subject: [PATCH] rebreak tests, move sanitization closer to write Signed-off-by: Parker Moore --- lib/jekyll/url.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb index f2318ae0..813b9c87 100644 --- a/lib/jekyll/url.rb +++ b/lib/jekyll/url.rb @@ -51,11 +51,8 @@ module Jekyll # Returns a sanitized String URL def sanitize_url(in_url) - # prevent escaped periods from bypassing sanitization - url = URI.unescape(in_url) - # Remove all double slashes - url = url.gsub(/\/\//, "/") + url = in_url.gsub(/\/\//, "/") # Remove every URL segment that consists solely of dots url = url.split('/').reject{ |part| part =~ /^\.+$/ }.join('/') @@ -66,7 +63,7 @@ module Jekyll # Always add a leading slash url.gsub!(/\A([^\/])/, '/\1') - URI.escape url + url end end end