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

backward compatiblize URLFilters (#6163) 

Merge pull request 6163
This commit is contained in:
ashmaroli 2017-06-21 23:54:14 +05:30 committed by jekyllbot
parent ca39b15255
commit 7a85376246
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jekyll/filters/url_filters.rb
View File

@ -11,6 +11,7 @@ module Jekyll
def absolute_url(input) def absolute_url(input)
return if input.nil? return if input.nil?
return input if Addressable::URI.parse(input).absolute? return input if Addressable::URI.parse(input).absolute?
site = @context.registers[:site]
return relative_url(input).to_s if site.config["url"].nil? return relative_url(input).to_s if site.config["url"].nil?
Addressable::URI.parse(site.config["url"] + relative_url(input)).normalize.to_s Addressable::URI.parse(site.config["url"] + relative_url(input)).normalize.to_s
end end
@ -40,11 +41,8 @@ module Jekyll
private private
def site
@context.registers[:site]
end
def sanitized_baseurl def sanitized_baseurl
site = @context.registers[:site]
site.config["baseurl"].to_s.chomp("/") site.config["baseurl"].to_s.chomp("/")
end end