Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 02:24:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Issue 5811: "objects" instead of "object"

Browse source
This commit is contained in:
Michael 2018-10-02 20:12:38 +00:00
parent c02dea7b02
commit 518d461a8f
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Protocol/ActivityPub.php
View file

@ -663,7 +663,7 @@ class ActivityPub
} elseif (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) {
$context_uri = $conversation['conversation-uri'];
} else {
$context_uri = str_replace('/object/', '/context/', $item['parent-uri']);
$context_uri = str_replace('/objects/', '/context/', $item['parent-uri']);
}
return $context_uri;
}

2
src/Protocol/Diaspora.php
View file

@ -1598,7 +1598,7 @@ class Diaspora
unset($parts['path']);
$host_url = Network::unparseURL($parts);
return $host_url . '/object/' . $guid;
return $host_url . '/objects/' . $guid;
}
return "";

2
src/Protocol/OStatus.php
View file

@ -2004,7 +2004,7 @@ class OStatus
}
if (intval($item["parent"]) > 0) {
$conversation_href = $conversation_uri = str_replace('/object/', '/context/', $item['parent-uri']);
$conversation_href = $conversation_uri = str_replace('/objects/', '/context/', $item['parent-uri']);
if (isset($parent_item)) {
$conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]);