From d553c6a88eb63eedec94e27ee8d3f1a8b1716986 Mon Sep 17 00:00:00 2001 From: Ben Hollis Date: Sun, 10 Feb 2013 17:51:47 -0800 Subject: [PATCH] Protect against unset current_path --- middleman-core/lib/middleman-core/sitemap.rb | 1 + middleman-more/lib/middleman-more/extensions/relative_assets.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-core/sitemap.rb b/middleman-core/lib/middleman-core/sitemap.rb index b3c75568..cbc9abbd 100644 --- a/middleman-core/lib/middleman-core/sitemap.rb +++ b/middleman-core/lib/middleman-core/sitemap.rb @@ -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 diff --git a/middleman-more/lib/middleman-more/extensions/relative_assets.rb b/middleman-more/lib/middleman-more/extensions/relative_assets.rb index 0bb0a777..c848f672 100644 --- a/middleman-more/lib/middleman-more/extensions/relative_assets.rb +++ b/middleman-more/lib/middleman-more/extensions/relative_assets.rb @@ -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)