dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5726 from jekyll/pull/remove-deprecated 

Merge pull request 5726
This commit is contained in:
jekyllbot 2017-01-07 03:37:47 -08:00 committed by GitHub
parent 08cec6889a 1e4b779ab3
commit 214eedc87b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/jekyll/filters.rb
View File

@ -1,4 +1,4 @@
require "uri" require "addressable/uri"
require "json" require "json"
require "date" require "date"
require "liquid" require "liquid"
@ -152,7 +152,7 @@ module Jekyll
# #
# Returns the escaped String. # Returns the escaped String.
def uri_escape(input) def uri_escape(input)
URI.escape(input) Addressable::URI.encode(input)
end end
# Replace any whitespace in the input string with a single space # Replace any whitespace in the input string with a single space

7
lib/jekyll/url.rb
View File

@ -1,4 +1,4 @@
require "uri" require "addressable/uri"
# Public: Methods that generate a URL for a resource such as a Post or a Page. # Public: Methods that generate a URL for a resource such as a Post or a Page.
# #
@ -145,7 +145,8 @@ module Jekyll
# pct-encoded = "%" HEXDIG HEXDIG # pct-encoded = "%" HEXDIG HEXDIG
# sub-delims = "!" / "$" / "&" / "'" / "(" / ")" # sub-delims = "!" / "$" / "&" / "'" / "(" / ")"
# / "*" / "+" / "," / ";" / "=" # / "*" / "+" / "," / ";" / "="
URI.escape(path, %r{[^a-zA-Z\d\-._~!$&'()*+,;=:@\/]}).encode("utf-8") path = Addressable::URI.encode(path)
path.encode("utf-8").sub("#", "%23")
end end
# Unescapes a URL path segment # Unescapes a URL path segment
@ -159,7 +160,7 @@ module Jekyll
# #
# Returns the unescaped path. # Returns the unescaped path.
def self.unescape_path(path) def self.unescape_path(path)
URI.unescape(path.encode("utf-8")) Addressable::URI.unencode(path.encode("utf-8"))
end end
end end
end end