github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 07:47:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Exit early when the 'img is already inside an 'a' tag

Browse Source
This commit is contained in:
Régis Hanol
2017-10-23 17:43:53 +02:00
committed by GitHub
parent 821ed23799
commit 04ae79896c
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/cooked_post_processor.rb
View File

@ -200,11 +200,10 @@ class CookedPostProcessor
def convert_to_link!(img) def convert_to_link!(img)
src = img["src"] src = img["src"]
return if src.blank? return if src.blank? || is_a_hyperlink?(img)
width, height = img["width"].to_i, img["height"].to_i width, height = img["width"].to_i, img["height"].to_i
# TODO: even though get_size is cached, a better solution is to store # TODO: store original dimentions in db
# both original and "cropped" dimensions on the uploads table
original_width, original_height = (get_size(src) || [0, 0]).map(&:to_i) original_width, original_height = (get_size(src) || [0, 0]).map(&:to_i)
# can't reach the image... # can't reach the image...
@ -215,7 +214,6 @@ class CookedPostProcessor
return if original_width <= width && original_height <= height return if original_width <= width && original_height <= height
return if original_width <= SiteSetting.max_image_width && original_height <= SiteSetting.max_image_height return if original_width <= SiteSetting.max_image_width && original_height <= SiteSetting.max_image_height
return if is_a_hyperlink?(img)
crop = false crop = false
if original_width.to_f / original_height.to_f < MIN_RATIO_TO_CROP if original_width.to_f / original_height.to_f < MIN_RATIO_TO_CROP
@ -236,8 +234,7 @@ class CookedPostProcessor
parent = img.parent parent = img.parent
while parent while parent
return true if parent.name == "a" return true if parent.name == "a"
break unless parent.respond_to? :parent parent = parent.parent if parent.respond_to?(:parent)
parent = parent.parent
end end
false false
end end