X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FMergeContacts.php;h=f04b64a23dc4b1507bd0570995ac5e1ed8a02214;hb=b218a7f218a97773d0d3419fafb5380cd8a2516c;hp=0d05c579fabaaa737b3419c97102c7ba3ed107dd;hpb=8db0e090d7afc3fbfeaf7a587140c80c98233484;p=friendica.git diff --git a/src/Console/MergeContacts.php b/src/Console/MergeContacts.php index 0d05c579fa..f04b64a23d 100644 --- a/src/Console/MergeContacts.php +++ b/src/Console/MergeContacts.php @@ -1,6 +1,6 @@ dba->selectFirst('contact', ['id', 'nurl', 'url'], ["`uri-id` = ? AND `nurl` != ? AND `url` != ?", $uriid, '', ''], ['order' => ['id']]); if (empty($first)) { - $this->err($this->l10n->t('No valid first countact found for uri-id %d.', $uriid)); + $this->err($this->l10n->t('No valid first contact found for uri-id %d.', $uriid)); return; } $this->out($first['url']); @@ -137,7 +138,7 @@ HELP; $this->updateTable('post-thread-user', 'contact-id', $from, $to, false); $this->updateTable('user-contact', 'cid', $from, $to, true); - if (!$this->dba->delete('contact', ['id' => $from])) { + if (!Contact::deleteById($from)) { $this->err($this->l10n->t('Deletion of id %d failed', $from)); } else { $this->out($this->l10n->t('Deletion of id %d was successful', $from));