keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10933 from annando/notice

Browse source 
Fix notice "Array to string conversion"
This commit is contained in:
Hypolite Petovan 2021-10-25 20:49:47 -04:00 committed by GitHub
commit e9a258b284
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Model/GServer.php
View file

@ -113,7 +113,7 @@ class GServer
if ($no_check || !self::check($url)) { if ($no_check || !self::check($url)) {
return null; return null;
} }
return self::getID($url, true); return self::getID($url, true);
} }
@ -1365,7 +1365,7 @@ class GServer
if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) { if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
$serverdata['detection-method'] = self::DETECT_GNUSOCIAL; $serverdata['detection-method'] = self::DETECT_GNUSOCIAL;
} }
return $serverdata; return $serverdata;
} }
@ -1425,7 +1425,7 @@ class GServer
return $serverdata; return $serverdata;
} }
if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) { if (in_array($serverdata['detection-method'], [self::DETECT_HEADER, self::DETECT_BODY, self::DETECT_MANUAL])) {
$serverdata['detection-method'] = $friendika ? self::DETECT_FRIENDIKA : self::DETECT_FRIENDICA; $serverdata['detection-method'] = $friendika ? self::DETECT_FRIENDIKA : self::DETECT_FRIENDICA;
} }
@ -1670,7 +1670,7 @@ class GServer
$gservers = DBA::select('gserver', ['id', 'url', 'nurl', 'network', 'poco', 'directory-type'], $gservers = DBA::select('gserver', ['id', 'url', 'nurl', 'network', 'poco', 'directory-type'],
["NOT `failed` AND `directory-type` != ? AND `last_poco_query` < ?", GServer::DT_NONE, $last_update], ["NOT `failed` AND `directory-type` != ? AND `last_poco_query` < ?", GServer::DT_NONE, $last_update],
['order' => ['RAND()']]); ['order' => ['RAND()']]);
while ($gserver = DBA::fetch($gservers)) { while ($gserver = DBA::fetch($gservers)) {
Logger::info('Update peer list', ['server' => $gserver['url'], 'id' => $gserver['id']]); Logger::info('Update peer list', ['server' => $gserver['url'], 'id' => $gserver['id']]);
Worker::add(PRIORITY_LOW, 'UpdateServerPeers', $gserver['url']); Worker::add(PRIORITY_LOW, 'UpdateServerPeers', $gserver['url']);
@ -1680,7 +1680,7 @@ class GServer
$fields = ['last_poco_query' => DateTimeFormat::utcNow()]; $fields = ['last_poco_query' => DateTimeFormat::utcNow()];
DBA::update('gserver', $fields, ['nurl' => $gserver['nurl']]); DBA::update('gserver', $fields, ['nurl' => $gserver['nurl']]);
if (--$no_of_queries == 0) { if (--$no_of_queries == 0) {
break; break;
} }

2
src/Worker/PubSubPublish.php
View file

@ -66,7 +66,7 @@ class PubSubPublish
$subscriber['topic']), $subscriber['topic']),
'X-Hub-Signature' => 'sha1=' . $hmac_sig]; 'X-Hub-Signature' => 'sha1=' . $hmac_sig];
Logger::debug('POST ' . ['headers' => $headers, 'params' => $params]); Logger::debug('POST', ['headers' => $headers, 'params' => $params]);
$postResult = DI::httpClient()->post($subscriber['callback_url'], $params, $headers); $postResult = DI::httpClient()->post($subscriber['callback_url'], $params, $headers);
$ret = $postResult->getReturnCode(); $ret = $postResult->getReturnCode();