Add tests for Network\Probe::getFeedLink

[friendica.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 2b739278a77d0c418b6cffc69ba595db5780c7c0..0d321189ffc2d12ad814e7c6240e8dca350e68ec 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -847,7 +847,7 @@ class Contact
                        $item['body'] = '';
                        $item['title'] = '';
                        $item['guid'] = '';
-                       $item['tag'] = '';
+                       $item['uri-id'] = 0;
                        $item['attach'] = '';
                        $slap = OStatus::salmon($item, $user);
 
@@ -1235,7 +1235,7 @@ class Contact
                }
 
                if (($contact['network'] == Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) {
-                       $poke_link = DI::baseUrl() . '/poke/?c=' . $contact['id'];
+                       $poke_link = 'contact/' . $contact['id'] . '/poke';
                }
 
                $contact_url = DI::baseUrl() . '/contact/' . $contact['id'];
@@ -2057,6 +2057,7 @@ class Contact
 
                        Worker::add(PRIORITY_HIGH, 'MergeContact', $first, $duplicate['id'], $uid);
                }
+               DBA::close($duplicates);
                Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl]);
                return true;
        }
@@ -2456,7 +2457,7 @@ class Contact
                                $item['body'] = '';
                                $item['title'] = '';
                                $item['guid'] = '';
-                               $item['tag'] = '';
+                               $item['uri-id'] = 0;
                                $item['attach'] = '';
 
                                $slap = OStatus::salmon($item, $owner);
@@ -2732,6 +2733,7 @@ class Contact
                                );
                        }
                }
+               DBA::close($contacts);
        }
 
        /**