php8 warnings, string and version update

This commit is contained in:
nobody 2021-07-19 14:24:22 -07:00
parent 11050854ec
commit 853ff59f0f
4 changed files with 490 additions and 475 deletions

View file

@ -17,7 +17,7 @@ use Zotlabs\Daemon\Run;
* @brief This file defines some global constants and includes the central App class.
*/
define ( 'STD_VERSION', '21.07.14' );
define ( 'STD_VERSION', '21.07.19' );
define ( 'ZOT_REVISION', '10.0' );
define ( 'DB_UPDATE_VERSION', 1250 );

View file

@ -234,7 +234,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = []) {
$dbg = [
'url' => $ret['debug']['url'],
'content_type' => $ret['debug']['content_type'],
'error_code' => $ret['debug']['error_code'],
'error_code' => ((isset($ret['debug']['error_code'])) ? $ret['debug']['error_code'] : 0),
'request_header' => $ret['debug']['request_header']
];
logger('z_fetch_url: error: ' . $url . ': ' . $ret['error'], LOGGER_DEBUG);

View file

@ -384,7 +384,15 @@ function import_remote_xchan_photo($photo, $xchan, $thing = false) {
}
}
elseif (intval($result['return_code']) === 304) {
// continue using our cached copy
// continue using our cached copy, although we still need to figure out the type
// for the benefit of upstream callers that may require it
$info = getimagesize('cache/xp/' . $hash . '-4' . (($thing) ? '.obj' : EMPTY_STR));
if (isset($info) && is_array($info) && array_key_exists('mime',$info)) {
$type = $info['mime'];
}
$photo = z_root() . '/xp/' . $hash . '-4' . (($thing) ? '.obj' : EMPTY_STR);
$thumb = z_root() . '/xp/' . $hash . '-5' . (($thing) ? '.obj' : EMPTY_STR);
$micro = z_root() . '/xp/' . $hash . '-6' . (($thing) ? '.obj' : EMPTY_STR);

File diff suppressed because it is too large Load diff