Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-12 06:24:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into phpstan-level-1

Browse source
This commit is contained in:
Art4 2024-11-18 21:45:42 +00:00
commit c79f3cde22
150 changed files with 2429 additions and 1781 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Protocol/ActivityPub/Queue.php
View file

@ -192,7 +192,7 @@ class Queue
}
if (!empty($entry['wid'])) {
$worker = DI::app()->getQueue();
$worker = DI::appHelper()->getQueue();
$wid = $worker['id'] ?? 0;
if ($entry['wid'] != $wid) {
$workerqueue = DBA::selectFirst('workerqueue', ['pid'], ['id' => $entry['wid'], 'done' => false]);

2
src/Protocol/Feed.php
View file

@ -1014,7 +1014,7 @@ class Feed
// Display events in the user's timezone
if (strlen($owner['timezone'])) {
DI::app()->setTimeZone($owner['timezone']);
DI::appHelper()->setTimeZone($owner['timezone']);
}
$previous_created = $last_update;