nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4822 from annando/issue-4816

Browse source 
Issue-4816: Avoid SQL errors / Unarchive living relais servers
This commit is contained in:
Hypolite Petovan 2018-04-12 07:13:27 -04:00 committed by GitHub
parent 7e004aab9b 4fd4d277f0
commit 33d60efd8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Model/Contact.php
View file

@ -345,9 +345,14 @@ class Contact extends BaseObject
$fields = ['term-date' => NULL_DATE, 'archive' => false];
dba::update('contact', $fields, ['id' => $contact['id']]);
if ($contact['url'] != '') {
if (!empty($contact['url'])) {
dba::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]);
}
if (!empty($contact['batch'])) {
$condition = ['batch' => $contact['batch'], 'contact-type' => ACCOUNT_TYPE_RELAY];
dba::update('contact', $fields, $condition);
}
}
/**

7
src/Protocol/PortableContact.php
View file

@ -1418,7 +1418,14 @@ class PortableContact
dba::delete('gserver-tag', ['gserver-id' => $gserver['id']]);
if ($data->scope == 'tags') {
// Avoid duplicates
$tags = [];
foreach ($data->tags as $tag) {
$tag = strtolower($tag);
$tags[$tag] = $tag;
}
foreach ($tags as $tag) {
dba::insert('gserver-tag', ['gserver-id' => $gserver['id'], 'tag' => $tag]);
}
}