]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Contact.php
Corrected variable name
[friendica.git] / src / Model / Contact.php
index 2b739278a77d0c418b6cffc69ba595db5780c7c0..becc80c0c3c6e09e557e77778aaf37cc59882b80 100644 (file)
@@ -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;
        }
@@ -2732,6 +2733,7 @@ class Contact
                                );
                        }
                }
+               DBA::close($contacts);
        }
 
        /**