keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13140 from annando/quote-loop

Browse source 
Fix: Prevent an endless loop when fetching quoted content
This commit is contained in:
Philipp 2023-05-19 21:54:29 +02:00 committed by GitHub
commit 28185c12fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Factory/Api/Mastodon/Status.php
View file

@ -335,7 +335,7 @@ class Status extends BaseFactory
$quote_id = $item['quote-uri-id']; $quote_id = $item['quote-uri-id'];
} }
if (!empty($quote_id)) { if (!empty($quote_id) && ($quote_id != $item['uri-id'])) {
try { try {
$quote = $this->createFromUriId($quote_id, $uid, false, false, false)->toArray(); $quote = $this->createFromUriId($quote_id, $uid, false, false, false)->toArray();
} catch (\Exception $exception) { } catch (\Exception $exception) {

2
view/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2023.05-rc\n" "Project-Id-Version: 2023.05-rc\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-19 17:46+0000\n" "POT-Creation-Date: 2023-05-19 19:50+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"