update FR translations THX kalon33

[friendica.git] / src / Console / MergeContacts.php

diff --git a/src/Console/MergeContacts.php b/src/Console/MergeContacts.php
index e4a268b1ef90e7981ceb90fada88bb8aff5f97a2..543ad316e7f9fc48c3f92589282c1e9c9e58095a 100644 (file)
--- a/src/Console/MergeContacts.php
+++ b/src/Console/MergeContacts.php
@@ -54,7 +54,7 @@ Description
 
 Options
        -h|--help|-? Show help information
-       -e|--execute Execute the dropping
+       -e|--execute Execute the merge
 HELP;
                return $help;
        }
@@ -73,6 +73,10 @@ HELP;
                while ($duplicate = $this->dba->fetch($duplicates)) {
                        $this->out($this->l10n->t('%d %s, %d duplicates.', $duplicate['uri-id'], $duplicate['url'], $duplicate['total']));
                        if ($this->getOption(['e', 'execute'], false)) {
+                               if (empty($duplicate['uri-id'])) {
+                                       $this->err($this->l10n->t('uri-id is empty for contact %s.', $duplicate['url']));
+                                       continue;
+                               }
                                $this->mergeContacts($duplicate['uri-id']);
                        }
                }