mirror of
https://github.com/friendica/friendica
synced 2024-06-14 16:56:25 +02:00
Merge remote-tracking branch 'upstream/develop' into no-blocklist
This commit is contained in:
commit
6530f82056
|
@ -96,6 +96,8 @@ class Conversation
|
||||||
private $session;
|
private $session;
|
||||||
/** @var Repository\UserGServer */
|
/** @var Repository\UserGServer */
|
||||||
private $userGServer;
|
private $userGServer;
|
||||||
|
/** @var Array */
|
||||||
|
private $blockList;
|
||||||
|
|
||||||
public function __construct(Repository\UserGServer $userGServer, LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, App\Page $page, App\Mode $mode, App $app, IHandleUserSessions $session)
|
public function __construct(Repository\UserGServer $userGServer, LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, App\Page $page, App\Mode $mode, App $app, IHandleUserSessions $session)
|
||||||
{
|
{
|
||||||
|
|
|
@ -3259,7 +3259,9 @@ class Diaspora
|
||||||
/// @todo - establish "all day" events in Friendica
|
/// @todo - establish "all day" events in Friendica
|
||||||
$eventdata['all_day'] = 'false';
|
$eventdata['all_day'] = 'false';
|
||||||
|
|
||||||
$eventdata['timezone'] = 'UTC';
|
// @todo Should be user timezone - but only if the event is supposed to be displayed
|
||||||
|
// in that specific timezone and not the user's timezone.
|
||||||
|
// $eventdata['timezone'] = 'UTC';
|
||||||
|
|
||||||
if ($event['start']) {
|
if ($event['start']) {
|
||||||
$eventdata['start'] = DateTimeFormat::utc($event['start'], $mask);
|
$eventdata['start'] = DateTimeFormat::utc($event['start'], $mask);
|
||||||
|
@ -3403,8 +3405,7 @@ class Diaspora
|
||||||
if ($item['event-id'] > 0) {
|
if ($item['event-id'] > 0) {
|
||||||
$event = self::buildEvent($item['event-id']);
|
$event = self::buildEvent($item['event-id']);
|
||||||
if (count($event)) {
|
if (count($event)) {
|
||||||
// Deactivated, since Diaspora seems to have problems with the processing.
|
$message['event'] = $event;
|
||||||
// $message['event'] = $event;
|
|
||||||
|
|
||||||
if (
|
if (
|
||||||
!empty($event['location']['address']) &&
|
!empty($event['location']['address']) &&
|
||||||
|
|
Loading…
Reference in a new issue