Skip to content

Commit

Permalink
see cl 1.48.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Dennis Patzer committed Feb 14, 2022
1 parent 0afd1f5 commit 3fe7b8f
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to this project will be documented in this file.

## [1.48.4] - 2022-02-14

- Fixed: array index issues in php 8+

## [1.48.3] - 2022-02-10

- Removed: truncate-html and twig extra bundles
Expand Down
2 changes: 1 addition & 1 deletion src/Item/DefaultItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ public function setFormattedValue(string $name, $value, bool $formatted = false)
*/
public function getFormattedValue(string $name)
{
return $this->_formatted[$name];
return $this->_formatted[$name] ?? null;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Lists/DefaultList.php
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ public function addDataAttributes()
$listConfig = $this->_manager->getListConfig();

foreach ($GLOBALS['TL_DCA']['tl_list_config']['fields'] as $field => $data) {
if ($data['eval']['addAsDataAttribute'] && $listConfig->{$field}) {
if (($data['eval']['addAsDataAttribute'] ?? false) && $listConfig->{$field}) {
$dataAttributes[] = 'data-'.$stringUtil->camelCaseToDashed($field).'="'.$listConfig->{$field}.'"';
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Resources/contao/dca/tl_list_config.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* Copyright (c) 2021 Heimrich & Hannot GmbH
* Copyright (c) 2022 Heimrich & Hannot GmbH
*
* @license LGPL-3.0-or-later
*/
Expand Down Expand Up @@ -93,7 +93,7 @@
'label' => &$GLOBALS['TL_LANG']['tl_list_config']['delete'],
'href' => 'act=delete',
'icon' => 'delete.gif',
'attributes' => 'onclick="if(!confirm(\''.$GLOBALS['TL_LANG']['MSC']['deleteConfirm'].'\'))return false;Backend.getScrollOffset()"',
'attributes' => 'onclick="if(!confirm(\''.($GLOBALS['TL_LANG']['MSC']['deleteConfirm'] ?? null).'\'))return false;Backend.getScrollOffset()"',
],
'show' => [
'label' => &$GLOBALS['TL_LANG']['tl_list_config']['show'],
Expand Down
4 changes: 2 additions & 2 deletions src/Resources/contao/dca/tl_list_config_element.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* Copyright (c) 2021 Heimrich & Hannot GmbH
* Copyright (c) 2022 Heimrich & Hannot GmbH
*
* @license LGPL-3.0-or-later
*/
Expand Down Expand Up @@ -62,7 +62,7 @@
'label' => &$GLOBALS['TL_LANG']['tl_list_config_element']['delete'],
'href' => 'act=delete',
'icon' => 'delete.gif',
'attributes' => 'onclick="if(!confirm(\''.$GLOBALS['TL_LANG']['MSC']['deleteConfirm'].'\'))return false;Backend.getScrollOffset()"',
'attributes' => 'onclick="if(!confirm(\''.($GLOBALS['TL_LANG']['MSC']['deleteConfirm'] ?? null).'\'))return false;Backend.getScrollOffset()"',
],
'show' => [
'label' => &$GLOBALS['TL_LANG']['tl_list_config_element']['show'],
Expand Down

0 comments on commit 3fe7b8f

Please sign in to comment.