Browse Source

Issue 5811: "objects" instead of "object"

pull/5812/head
Michael 3 years ago
parent
commit
518d461a8f
6 changed files with 6 additions and 6 deletions
  1. +1
    -1
      mod/display.php
  2. +1
    -1
      src/Model/Item.php
  3. +1
    -1
      src/Module/Objects.php
  4. +1
    -1
      src/Protocol/ActivityPub.php
  5. +1
    -1
      src/Protocol/Diaspora.php
  6. +1
    -1
      src/Protocol/OStatus.php

+ 1
- 1
mod/display.php View File

@ -78,7 +78,7 @@ function display_init(App $a)
}
if (ActivityPub::isRequest()) {
goaway(str_replace('display/', 'object/', $a->query_string));
goaway(str_replace('display/', 'objects/', $a->query_string));
}
if ($item["id"] != $item["parent"]) {


+ 1
- 1
src/Model/Item.php View File

@ -2361,7 +2361,7 @@ class Item extends BaseObject
$guid = System::createUUID();
}
return self::getApp()->get_baseurl() . '/object/' . $guid;
return self::getApp()->get_baseurl() . '/objects/' . $guid;
}
/**


src/Module/Object.php → src/Module/Objects.php View File


+ 1
- 1
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;
}


+ 1
- 1
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 "";


+ 1
- 1
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]);


Loading…
Cancel
Save