bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into contact-tabs

Browse source
This commit is contained in:
Michael 2020-08-03 16:06:07 +00:00
commit 748ddb7ad2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Contact.php
View file

@ -3096,7 +3096,7 @@ class Contact
* @param array $urls * @param array $urls
* @return array result "count", "added" and "updated" * @return array result "count", "added" and "updated"
*/ */
public static function addContactsByArray(array $urls) public static function addByUrls(array $urls)
{ {
$added = 0; $added = 0;
$updated = 0; $updated = 0;

2
src/Worker/PullDirectory.php
View file

@ -60,7 +60,7 @@ class PullDirectory
return; return;
} }
$result = Contact::addContactsByArray($contacts['results']); $result = Contact::addByUrls($contacts['results']);
$now = $contacts['now'] ?? 0; $now = $contacts['now'] ?? 0;
DI::config()->set('system', 'last-directory-sync', $now); DI::config()->set('system', 'last-directory-sync', $now);

4
src/Worker/UpdateServerDirectory.php
View file

@ -71,7 +71,7 @@ class UpdateServerDirectory
} }
} }
$result = Contact::addContactsByArray($urls); $result = Contact::addByUrls($urls);
Logger::info('PoCo discovery ended', ['count' => $result['count'], 'added' => $result['added'], 'updated' => $result['updated'], 'poco' => $gserver['poco']]); Logger::info('PoCo discovery ended', ['count' => $result['count'], 'added' => $result['added'], 'updated' => $result['updated'], 'poco' => $gserver['poco']]);
} }
@ -99,7 +99,7 @@ class UpdateServerDirectory
} }
} }
$result = Contact::addContactsByArray($urls); $result = Contact::addByUrls($urls);
Logger::info('Account discovery ended', ['count' => $result['count'], 'added' => $result['added'], 'updated' => $result['updated'], 'url' => $gserver['url']]); Logger::info('Account discovery ended', ['count' => $result['count'], 'added' => $result['added'], 'updated' => $result['updated'], 'url' => $gserver['url']]);
} }