mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 21:35:13 +00:00
php8 warnings, string and version update
This commit is contained in:
parent
11050854ec
commit
853ff59f0f
4 changed files with 490 additions and 475 deletions
2
boot.php
2
boot.php
|
@ -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 );
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
951
util/messages.po
951
util/messages.po
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue