friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Only add tags in the "tags" scope

This commit is contained in:
Michael 2018-03-26 06:11:55 +00:00
parent e65bd0325e
commit 6b84cb9715
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Protocol/PortableContact.php
View File

@ -1378,7 +1378,7 @@ class PortableContact
dba::insert('gserver', $fields);
}
if (in_array($fields['network'], [NETWORK_DFRN, NETWORK_DIASPORA])) {
if (!$failure && in_array($fields['network'], [NETWORK_DFRN, NETWORK_DIASPORA])) {
self::discoverRelay(server_url);
}
@ -1410,8 +1410,10 @@ class PortableContact
dba::update('gserver', $fields, ['id' => $gserver['id']]);
dba::delete('gserver-tag', ['gserver-id' => $gserver['id']]);
foreach ($data->tags as $tag) {
dba::insert('gserver-tag', ['gserver-id' => $gserver['id'], 'tag' => $tag]);
if ($data->scope == 'tags') {
foreach ($data->tags as $tag) {
dba::insert('gserver-tag', ['gserver-id' => $gserver['id'], 'tag' => $tag]);
}
}
}