Merge remote-tracking branch 'upstream/develop' into api4
This commit is contained in:
commit
b67c10812a
272 changed files with 989 additions and 963 deletions
|
|
@ -40,7 +40,7 @@ use Friendica\Protocol\DFRN;
|
|||
function display_init(App $a)
|
||||
{
|
||||
if (ActivityPub::isRequest()) {
|
||||
Objects::rawContent(['guid' => DI::args()->getArgv()[1] ?? null]);
|
||||
(new Objects(['guid' => DI::args()->getArgv()[1] ?? null]))->rawContent();
|
||||
}
|
||||
|
||||
if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ function unfollow_process(string $url)
|
|||
|
||||
$owner = User::getOwnerDataById($uid);
|
||||
if (!$owner) {
|
||||
\Friendica\Module\Security\Logout::init();
|
||||
(new \Friendica\Module\Security\Logout())->init();
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue