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

Merge remote-tracking branch 'upstream/develop' into lemmy

Browse source
This commit is contained in:
Michael 2023-06-18 17:38:39 +00:00
commit 8a50101eea
21 changed files with 203 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Module/Item/Compose.php
View file

@ -191,7 +191,8 @@ class Compose extends BaseModule
'editalic' => $this->l10n->t('Italic'),
'eduline' => $this->l10n->t('Underline'),
'edquote' => $this->l10n->t('Quote'),
'$edemojis' => $this->l10n->t('Add emojis'),
'edemojis' => $this->l10n->t('Add emojis'),
'contentwarn' => $this->l10n->t('Content Warning'),
'edcode' => $this->l10n->t('Code'),
'edimg' => $this->l10n->t('Image'),
'edurl' => $this->l10n->t('Link'),

4
src/Module/Magic.php
View file

@ -130,8 +130,8 @@ class Magic extends BaseModule
}
$header = [
'Accept' => ['application/x-dfrn+json', 'application/x-zot+json'],
'X-Open-Web-Auth' => [Strings::getRandomHex()],
'Accept' => 'application/x-dfrn+json, application/x-zot+json',
'X-Open-Web-Auth' => Strings::getRandomHex()
];
// Create a header that is signed with the local users private key.