deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Protect against unset current_path

Browse source
This commit is contained in:
Ben Hollis 2013-02-10 17:51:47 -08:00
parent 5a585dd3ab
commit d553c6a88e
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
middleman-core/lib/middleman-core/sitemap.rb
View file

@ -70,6 +70,7 @@ module Middleman
# Get the resource object for the current path # Get the resource object for the current path
# @return [Middleman::Sitemap::Resource] # @return [Middleman::Sitemap::Resource]
def current_resource def current_resource
return nil unless current_path
sitemap.find_resource_by_destination_path(current_path) sitemap.find_resource_by_destination_path(current_path)
end end

2
middleman-more/lib/middleman-more/extensions/relative_assets.rb
View file

@ -32,7 +32,7 @@ module Middleman
def asset_url(path, prefix="") def asset_url(path, prefix="")
path = super(path, prefix) path = super(path, prefix)
if path.include?("//") if path.include?("//") || !current_resource
path path
else else
current_dir = Pathname('/' + current_resource.destination_path) current_dir = Pathname('/' + current_resource.destination_path)