friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #7788 from annando/errors 

Fix several warnings and errors
This commit is contained in:
Tobias Diekershoff 2019-10-30 09:20:13 +01:00 committed by GitHub
parent d6ff89d7b4 dc065eed42
commit ad4485f4ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/GContact.php
View File

@ -841,7 +841,7 @@ class GContact
if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
$noscrape = json_decode($curlResult->getBody(), true);
if (!empty($noscrape)) {
if (!empty($noscrape) && !empty($noscrape['updated'])) {
$noscrape['updated'] = DateTimeFormat::utc($noscrape['updated'], DateTimeFormat::MYSQL);
$fields = ['last_contact' => DateTimeFormat::utcNow(), 'updated' => $noscrape['updated']];
DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($data['url'])]);
@ -1130,8 +1130,8 @@ class GContact
'birthday' => $userdata['dob'], 'photo' => $userdata['photo'],
"notify" => $userdata['notify'], 'url' => $userdata['url'],
"hide" => ($userdata['hidewall'] || !$userdata['net-publish']),
'nick' => $userdata['nickname'], 'addr' => $addr,
"connect" => $addr, "server_url" => System::baseUrl(),
'nick' => $userdata['nickname'], 'addr' => $userdata['addr'],
"connect" => $userdata['addr'], "server_url" => System::baseUrl(),
"generation" => 1, 'network' => Protocol::DFRN];
self::update($gcontact);

3
src/Model/User.php
View File

@ -190,7 +190,8 @@ class User
`user`.`page-flags`,
`user`.`account-type`,
`user`.`prvnets`,
`user`.`account_removed`
`user`.`account_removed`,
`user`.`hidewall`
FROM `contact`
INNER JOIN `user`
ON `user`.`uid` = `contact`.`uid`

3
src/Worker/Notifier.php
View File

@ -152,6 +152,9 @@ class Notifier
$fields = ['network', 'author-id', 'author-link', 'owner-id'];
$condition = ['uri' => $target_item["thr-parent"], 'uid' => $target_item["uid"]];
$thr_parent = Item::selectFirst($fields, $condition);
if (empty($thr_parent)) {
$thr_parent = $parent;
}
Logger::log('GUID: ' . $target_item["guid"] . ': Parent is ' . $parent['network'] . '. Thread parent is ' . $thr_parent['network'], Logger::DEBUG);