Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 03:50:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

merged from develop and increased DB-version

Browse source
This commit is contained in:
Philipp Holzer 2018-07-04 23:44:11 +02:00
commit 19209f6826
No known key found for this signature in database
GPG key ID: 58160D7D6AF942B6
29 changed files with 3900 additions and 3515 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Protocol/DFRN.php
View file

@ -2087,13 +2087,6 @@ class DFRN
logger('Contacts are updated.');
// update items
// This is an extreme performance killer
Item::update(['owner-link' => $relocate["url"]], ['owner-link' => $old["url"], 'uid' => $importer["importer_uid"]]);
Item::update(['author-link' => $relocate["url"]], ['author-link' => $old["url"], 'uid' => $importer["importer_uid"]]);
logger('Items are updated.');
/// @TODO
/// merge with current record, current contents have priority
/// update record, set url-updated

7
src/Protocol/Diaspora.php
View file

@ -1543,13 +1543,6 @@ class Diaspora
logger('Contacts are updated.');
// update items
// This is an extreme performance killer
Item::update(['owner-link' => $data["url"]], ['owner-link' => $contact["url"], 'uid' => $importer["uid"]]);
Item::update(['author-link' => $data["url"]], ['author-link' => $contact["url"], 'uid' => $importer["uid"]]);
logger('Items are updated.');
return true;
}

4
src/Protocol/OStatus.php
View file

@ -341,7 +341,7 @@ class OStatus
$header["type"] = "remote";
$header["wall"] = 0;
$header["origin"] = 0;
$header["gravity"] = GRAVITY_PARENT;
$header["gravity"] = GRAVITY_COMMENT;
$first_child = $doc->firstChild->tagName;
@ -683,9 +683,9 @@ class OStatus
}
$item["type"] = 'remote-comment';
$item["gravity"] = GRAVITY_COMMENT;
} else {
$item["parent-uri"] = $item["uri"];
$item["gravity"] = GRAVITY_PARENT;
}
if (($item['author-link'] != '') && !empty($item['protocol'])) {