Merge remote-tracking branch 'origin/3.0-stable'

This commit is contained in:
Ben Hollis 2013-02-10 18:05:24 -08:00
commit 51a494b343
2 changed files with 2 additions and 1 deletions

View file

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

View file

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