From de6a4679a64ebe194956dbac3f2625276333c37b Mon Sep 17 00:00:00 2001 From: tdreyno Date: Wed, 28 Oct 2009 14:54:25 -0700 Subject: [PATCH] fix auto image sizes --- lib/middleman/features/automatic_image_sizes.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/middleman/features/automatic_image_sizes.rb b/lib/middleman/features/automatic_image_sizes.rb index 23b3e6a5..9352740a 100644 --- a/lib/middleman/features/automatic_image_sizes.rb +++ b/lib/middleman/features/automatic_image_sizes.rb @@ -3,13 +3,13 @@ require "middleman/fastimage" class Middleman::Base alias_method :pre_automatic_image_tag, :image_tag helpers do - def image_tag(path, params={}) + def image_tag(path, params={}) if (!params[:width] || !params[:height]) && !path.include?("://") params[:alt] ||= "" - prefix = options.http_images_path rescue options.images_dir + http_prefix = options.http_images_path rescue options.images_dir begin - real_path = File.join(options.public, asset_url(path, prefix)) + real_path = File.join(options.public, options.images_dir, path) if File.exists? real_path dimensions = Middleman::FastImage.size(real_path, :raise_on_failure => true) params[:width] ||= dimensions[0] @@ -18,7 +18,7 @@ class Middleman::Base rescue end - params = params.merge(:src => asset_url(path, prefix)) + params = params.merge(:src => asset_url(path, http_prefix)) params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ') "" else