diff --git a/calendar-bundle/contao/dca/tl_calendar_events.php b/calendar-bundle/contao/dca/tl_calendar_events.php index 51d5f909d0d..190ed1e54b3 100644 --- a/calendar-bundle/contao/dca/tl_calendar_events.php +++ b/calendar-bundle/contao/dca/tl_calendar_events.php @@ -78,7 +78,7 @@ 'sorting' => array ( 'mode' => DataContainer::MODE_PARENT, - 'fields' => array('startTime'), + 'fields' => array('startTime DESC'), 'headerFields' => array('title', 'jumpTo', 'tstamp', 'protected', 'allowComments'), 'panelLayout' => 'filter;sort,search,limit', 'defaultSearchField' => 'title', @@ -185,8 +185,6 @@ 'default' => static fn () => BackendUser::getInstance()->id, 'search' => true, 'filter' => true, - 'sorting' => true, - 'flag' => DataContainer::SORT_ASC, 'inputType' => 'select', 'foreignKey' => 'tl_user.name', 'eval' => array('doNotCopy'=>true, 'chosen'=>true, 'mandatory'=>true, 'includeBlankOption'=>true, 'tl_class'=>'w50'), @@ -204,7 +202,7 @@ 'default' => time(), 'filter' => true, 'sorting' => true, - 'flag' => DataContainer::SORT_MONTH_DESC, + 'flag' => DataContainer::SORT_MONTH_BOTH, 'inputType' => 'text', 'eval' => array('rgxp'=>'time', 'mandatory'=>true, 'doNotCopy'=>true, 'tl_class'=>'w50'), 'load_callback' => array @@ -845,7 +843,7 @@ public function getArticleAlias(DataContainer $dc) while ($objAlias->next()) { - $arrAlias[$objAlias->parent][$objAlias->id] = $objAlias->title . ' (' . ($GLOBALS['TL_LANG']['COLS'][$objAlias->inColumn] ?: $objAlias->inColumn) . ', ID ' . $objAlias->id . ')'; + $arrAlias[$objAlias->parent][$objAlias->id] = $objAlias->title . ' (' . ($GLOBALS['TL_LANG']['COLS'][$objAlias->inColumn] ?? $objAlias->inColumn) . ', ID ' . $objAlias->id . ')'; } } diff --git a/calendar-bundle/contao/modules/ModuleEventReader.php b/calendar-bundle/contao/modules/ModuleEventReader.php index fb00a2fddd2..5307c289d52 100644 --- a/calendar-bundle/contao/modules/ModuleEventReader.php +++ b/calendar-bundle/contao/modules/ModuleEventReader.php @@ -316,10 +316,7 @@ protected function compile() ->enableLightbox($objEvent->fullsize) ->buildIfResourceExists(); - if (null !== $figure) - { - $figure->applyLegacyTemplateData($objTemplate, null, $objEvent->floating); - } + $figure?->applyLegacyTemplateData($objTemplate, null, $objEvent->floating); } $objTemplate->enclosure = array(); diff --git a/calendar-bundle/public/calendar.svg b/calendar-bundle/public/calendar.svg index 0ab0cdc5778..80e9f6270bc 100644 --- a/calendar-bundle/public/calendar.svg +++ b/calendar-bundle/public/calendar.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/comments-bundle/contao/dca/tl_comments.php b/comments-bundle/contao/dca/tl_comments.php index a5799717957..1c5b7f249f5 100644 --- a/comments-bundle/contao/dca/tl_comments.php +++ b/comments-bundle/contao/dca/tl_comments.php @@ -140,14 +140,12 @@ 'source' => array ( 'filter' => true, - 'sorting' => true, 'reference' => &$GLOBALS['TL_LANG']['tl_comments'], 'sql' => "varchar(32) NOT NULL default ''" ), 'parent' => array ( 'filter' => true, - 'sorting' => true, 'sql' => "int(10) unsigned NOT NULL default 0" ), 'date' => array @@ -221,6 +219,7 @@ ( 'toggle' => true, 'filter' => true, + 'sorting' => true, 'inputType' => 'checkbox', 'eval' => array('doNotCopy'=>true), 'save_callback' => array @@ -567,11 +566,9 @@ public function listComments($arrRow) $key = ($arrRow['published'] ? 'published' : 'unpublished') . ($arrRow['addReply'] ? ' replied' : ''); return ' -
' . $title . '