harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mastodon reshares can be either posts or comments; silence warning from guess_image_type when handed a URL to a non-existent resource.

Browse Source
This commit is contained in:
zotlabs 2017-06-25 18:07:07 -07:00
parent 6c771f84ce
commit 07d6472eea
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/feedutils.php
View File

@ -691,7 +691,7 @@ function get_atom_elements($feed, $item, &$author) {
if(array_key_exists('verb',$res) && $res['verb'] === ACTIVITY_SHARE
&& array_key_exists('obj_type',$res) && $res['obj_type'] === ACTIVITY_OBJ_NOTE) {
&& array_key_exists('obj_type',$res) && in_array($res['obj_type'], [ ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT ] )) {
feed_get_reshare($res,$item);
}

12
include/photo/photo_driver.php
View File

@ -495,12 +495,22 @@ function guess_image_type($filename, $headers = '') {
}
}
if(is_null($type)) {
if(is_null($type) && (strpos($filename,'http:') === false)) {
$size = getimagesize($filename);
$ph = photo_factory('');
$types = $ph->supportedTypes();
$type = ((array_key_exists($size['mime'], $types)) ? $size['mime'] : 'image/jpeg');
}
if(is_null($type)) {
if(strpos(strtolower($filename),'jpg') !== false)
$type = 'image/jpeg';
elseif(strpos(strtolower($filename),'jpeg') !== false)
$type = 'image/jpeg';
elseif(strpos(strtolower($filename),'gif') !== false)
$type = 'image/gif';
elseif(strpos(strtolower($filename),'png') !== false)
$type = 'image/png';
}
}
logger('Photo: guess_image_type: type = ' . $type, LOGGER_DEBUG);