failsafe wasn't working if image got overriden

refinery · Sep 3, 2009 · f18cf66 · f18cf66
1 parent 81e725c
commit f18cf66
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/vendor/plugins/refinery/app/helpers/application_helper.rb b/vendor/plugins/refinery/app/helpers/application_helper.rb
@@ -41,8 +41,8 @@ def selected_page?(page)
 
 	def image_fu(image, thumbnail, options={})
 		begin
-			image = image.thumbnails.reject!{|t| t.thumbnail != thumbnail.to_s}.first unless thumbnail.nil?
-			image_tag image.public_filename, {:width => image.width, :height => image.height}.merge!(options)
+			image_to_use = thumbnail.nil? ? image : image.thumbnails.reject!{|t| t.thumbnail != thumbnail.to_s}.first
+			image_tag image_to_use.public_filename, {:width => image_to_use.width, :height => image_to_use.height}.merge!(options)
 		rescue
 			image_tag image.public_filename(thumbnail), options
 		end