Merge remote-tracking branch 'upstream/2022.09-rc' into worker-timeout

This commit is contained in:
Michael 2022-09-26 13:26:56 +00:00
commit 5e51ab95fb
28 changed files with 533 additions and 224 deletions

View file

@ -193,7 +193,7 @@ class Cron
*/
private static function addIntros()
{
$contacts = DBA::p("SELECT `uid`, `id`, `created` FROM `contact` WHERE `rel` = ? AND `pending` AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id`)", Contact::FOLLOWER);
$contacts = DBA::p("SELECT `uid`, `id`, `created` FROM `contact` WHERE `rel` = ? AND `pending` AND NOT `id` IN (SELECT `contact-id` FROM `intro`)", Contact::FOLLOWER);
while ($contact = DBA::fetch($contacts)) {
$fields = [
'uid' => $contact['uid'],