bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #10917 from MrPetovan/bug/10914-event-feed-time

Browse source 
Add event timezone in Model\Event::getHTML
This commit is contained in:
Michael Vogel 2021-10-25 06:33:20 +02:00 • committed by GitHub
commit 5dc283ba8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/App.php
View file

@ -631,7 +631,9 @@ class App
Model\Profile::openWebAuthInit($token);
}
$auth->withSession($this);
if (!$this->mode->isBackend()) {
$auth->withSession($this);
}
if (empty($_SESSION['authenticated'])) {
header('X-Account-Management-Status: none');

2
src/Model/Event.php
View file

@ -49,7 +49,7 @@ class Event
$uriid = $event['uri-id'] ?? $uriid;
$bd_format = DI::l10n()->t('l F d, Y \@ g:i A'); // Friday January 18, 2011 @ 8 AM.
$bd_format = DI::l10n()->t('l F d, Y \@ g:i A \G\M\TP (e)'); // Friday October 29, 2021 @ 9:15 AM GMT-04:00 (America/New_York)
$event_start = DI::l10n()->getDay(DateTimeFormat::local($event['start'], $bd_format));