Merge remote-tracking branch 'upstream/develop' into contact-tabs

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 9bd63f83dd61f37361a4f19de49526c431a206d0..1adf2427587ca8e7463dc741acaeb23190a55c8e 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -3096,7 +3096,7 @@ class Contact
         * @param array $urls
         * @return array result "count", "added" and "updated"
         */
-       public static function addContactsByArray(array $urls)
+       public static function addByUrls(array $urls)
        {
                $added = 0;
                $updated = 0;

diff --git a/src/Worker/PullDirectory.php b/src/Worker/PullDirectory.php
index 250496009d27ad38a707b96a0c159fa4d85654d8..625431518d82d90920661ac7aa8a636ebe8526da 100644 (file)
--- a/src/Worker/PullDirectory.php
+++ b/src/Worker/PullDirectory.php
@@ -60,7 +60,7 @@ class PullDirectory
                        return;
                }
 
-               $result = Contact::addContactsByArray($contacts['results']);
+               $result = Contact::addByUrls($contacts['results']);
 
                $now = $contacts['now'] ?? 0;
                DI::config()->set('system', 'last-directory-sync', $now);

diff --git a/src/Worker/UpdateServerDirectory.php b/src/Worker/UpdateServerDirectory.php
index fe4b9f916297a03c62a6b729c6e2fe146635d98d..dd94aa52c7a8555e17dbe2b9ba7c29127311aa6d 100644 (file)
--- a/src/Worker/UpdateServerDirectory.php
+++ b/src/Worker/UpdateServerDirectory.php
@@ -71,7 +71,7 @@ class UpdateServerDirectory
                        }
                }
 
-               $result = Contact::addContactsByArray($urls);
+               $result = Contact::addByUrls($urls);
 
                Logger::info('PoCo discovery ended', ['count' => $result['count'], 'added' => $result['added'], 'updated' => $result['updated'], 'poco' => $gserver['poco']]);
        }
@@ -99,7 +99,7 @@ class UpdateServerDirectory
                        }
                }
 
-               $result = Contact::addContactsByArray($urls);
+               $result = Contact::addByUrls($urls);
 
                Logger::info('Account discovery ended', ['count' => $result['count'], 'added' => $result['added'], 'updated' => $result['updated'], 'url' => $gserver['url']]);
        }