From 9311a72e4aa45813c06c7387883ae0734766e234 Mon Sep 17 00:00:00 2001 From: Ben Hollis Date: Mon, 28 Dec 2015 20:50:55 -0800 Subject: [PATCH] Use our relative_path_from_resource helper in asset_url. --- middleman-core/lib/middleman-core/util.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb index 4097c9dd..ffd76eb6 100644 --- a/middleman-core/lib/middleman-core/util.rb +++ b/middleman-core/lib/middleman-core/util.rb @@ -221,12 +221,7 @@ module Middleman end end - final_result = if options[:relative] - current_dir = Pathname('/' + options[:current_resource].destination_path) - Pathname(result).relative_path_from(current_dir.dirname).to_s - else - result - end + final_result = URI.encode(relative_path_from_resource(options[:current_resource], result, options[:relative])) result_uri = URI(final_result) result_uri.query = uri.query