fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 11:44:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1816 allow images of at least 100x100px when creating large thumbnails

Browse source
This commit is contained in:
Kijin Sung 2021-12-31 01:41:04 +09:00
parent 9b794c6df2
commit ae28116ac0
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/comment/comment.item.php
View file

@ -790,6 +790,8 @@ class commentItem extends BaseObject
// get an image file from the doc content if no file attached. // get an image file from the doc content if no file attached.
if(!$source_file && $config->thumbnail_target !== 'attachment') if(!$source_file && $config->thumbnail_target !== 'attachment')
{ {
$external_image_min_width = min(100, round($trigger_obj->width * 0.3));
$external_image_min_height = min(100, round($trigger_obj->height * 0.3));
preg_match_all("!<img\s[^>]*?src=(\"|')([^\"' ]*?)(\"|')!is", $this->get('content'), $matches, PREG_SET_ORDER); preg_match_all("!<img\s[^>]*?src=(\"|')([^\"' ]*?)(\"|')!is", $this->get('content'), $matches, PREG_SET_ORDER);
foreach($matches as $match) foreach($matches as $match)
{ {
@ -820,7 +822,7 @@ class commentItem extends BaseObject
if($is_img = @getimagesize($tmp_file)) if($is_img = @getimagesize($tmp_file))
{ {
list($_w, $_h, $_t, $_a) = $is_img; list($_w, $_h, $_t, $_a) = $is_img;
if($_w < ($width * 0.3) && ($height === 'auto' || $_h < ($height * 0.3))) if($_w < ($external_image_min_width) && ($height === 'auto' || $_h < ($external_image_min_height)))
{ {
continue; continue;
} }

4
modules/document/document.item.php
View file

@ -1199,6 +1199,8 @@ class documentItem extends BaseObject
// If not exists, file an image file from the content // If not exists, file an image file from the content
if(!$source_file && $config->thumbnail_target !== 'attachment') if(!$source_file && $config->thumbnail_target !== 'attachment')
{ {
$external_image_min_width = min(100, round($trigger_obj->width * 0.3));
$external_image_min_height = min(100, round($trigger_obj->height * 0.3));
preg_match_all("!<img\s[^>]*?src=(\"|')([^\"' ]*?)(\"|')!is", $content, $matches, PREG_SET_ORDER); preg_match_all("!<img\s[^>]*?src=(\"|')([^\"' ]*?)(\"|')!is", $content, $matches, PREG_SET_ORDER);
foreach($matches as $match) foreach($matches as $match)
{ {
@ -1229,7 +1231,7 @@ class documentItem extends BaseObject
if($is_img = @getimagesize($tmp_file)) if($is_img = @getimagesize($tmp_file))
{ {
list($_w, $_h, $_t, $_a) = $is_img; list($_w, $_h, $_t, $_a) = $is_img;
if($_w < ($width * 0.3) && ($height === 'auto' || $_h < ($height * 0.3))) if($_w < ($external_image_min_width) && ($height === 'auto' || $_h < ($external_image_min_height)))
{ {
continue; continue;
} }