bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into dfrn-reshare

Browse source
This commit is contained in:
Michael 2018-04-19 05:44:06 +00:00
commit da06416426
4 changed files with 271 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Model/Contact.php
View file

@ -1482,6 +1482,11 @@ class Contact extends BaseObject
}
// send email notification to owner?
} else {
if (dba::exists('contact', ['nurl' => normalise_link($url), 'uid' => $importer['uid'], 'pending' => true])) {
logger('ignoring duplicated connection request from pending contact ' . $url);
return;
}
// create contact record
q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
`blocked`, `readonly`, `pending`, `writable`)

2
src/Protocol/PortableContact.php
View file

@ -1421,7 +1421,7 @@ class PortableContact
// Avoid duplicates
$tags = [];
foreach ($data->tags as $tag) {
$tag = strtolower($tag);
$tag = mb_strtolower($tag);
$tags[$tag] = $tag;
}