Merge pull request #11515 from annando/issue-11492
Issue 11492: Improvements for contact import
This commit is contained in:
commit
204e52ea30
|
@ -349,7 +349,7 @@ class Account extends BaseSettings
|
|||
// "http" or "@" to be present in the string.
|
||||
// All other fields from the row will be ignored
|
||||
if ((strpos($csvRow[0], '@') !== false) || in_array(parse_url($csvRow[0], PHP_URL_SCHEME), ['http', 'https'])) {
|
||||
Worker::add(PRIORITY_LOW, 'AddContact', $_SESSION['uid'], $csvRow[0]);
|
||||
Worker::add(PRIORITY_MEDIUM, 'AddContact', local_user(), $csvRow[0]);
|
||||
} else {
|
||||
Logger::notice('Invalid account', ['url' => $csvRow[0]]);
|
||||
}
|
||||
|
|
|
@ -41,6 +41,6 @@ class AddContact
|
|||
}
|
||||
|
||||
$result = Contact::createFromProbeForUser($uid, $url);
|
||||
Logger::info('Added contact', ['uid' => $uid, 'url' => $url, 'result' => $result]);
|
||||
Logger::info('Added contact for user', ['uid' => $uid, 'url' => $url, 'result' => $result]);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user