"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "core-bundle/src/Resources/contao/classes/DataContainer.php" between
contao-4.11.3.tar.gz and contao-4.11.4.tar.gz

About: Contao (fka TYPOlight) is a content management system (CMS). Latest release.

DataContainer.php  (contao-4.11.3):DataContainer.php  (contao-4.11.4)
skipping to change at line 779 skipping to change at line 779
foreach ($GLOBALS['TL_DCA'][$strTable]['list']['operations'] as $ k=>$v) foreach ($GLOBALS['TL_DCA'][$strTable]['list']['operations'] as $ k=>$v)
{ {
$v = \is_array($v) ? $v : array($v); $v = \is_array($v) ? $v : array($v);
$id = StringUtil::specialchars(rawurldecode($arrRow['id'] )); $id = StringUtil::specialchars(rawurldecode($arrRow['id'] ));
$label = $title = $k; $label = $title = $k;
if (isset($v['label'])) if (isset($v['label']))
{ {
if (\is_array($v['label'])) if (\is_array($v['label']))
{ {
$label = $v['label'][0]; $label = $v['label'][0] ?? null;
$title = sprintf($v['label'][1], $id); $title = sprintf($v['label'][1] ?? '', $i
d);
} }
else else
{ {
$label = $title = sprintf($v['label'], $i d); $label = $title = sprintf($v['label'], $i d);
} }
} }
$attributes = !empty($v['attributes']) ? ' ' . ltrim(spri ntf($v['attributes'], $id, $id)) : ''; $attributes = !empty($v['attributes']) ? ' ' . ltrim(spri ntf($v['attributes'], $id, $id)) : '';
// Add the key as CSS class // Add the key as CSS class
skipping to change at line 895 skipping to change at line 895
foreach ($GLOBALS['TL_DCA'][$this->strTable]['list']['global_oper ations'] as $k=>$v) foreach ($GLOBALS['TL_DCA'][$this->strTable]['list']['global_oper ations'] as $k=>$v)
{ {
if (!($v['showOnSelect'] ?? null) && Input::get('act') == 'select') if (!($v['showOnSelect'] ?? null) && Input::get('act') == 'select')
{ {
continue; continue;
} }
$v = \is_array($v) ? $v : array($v); $v = \is_array($v) ? $v : array($v);
$label = \is_array($v['label']) ? $v['label'][0] : $v['la bel']; $label = \is_array($v['label']) ? $v['label'][0] : $v['la bel'];
$title = \is_array($v['label']) ? $v['label'][1] : $v['la bel']; $title = \is_array($v['label']) ? ($v['label'][1] ?? null ) : $v['label'];
$attributes = !empty($v['attributes']) ? ' ' . ltrim($v[' attributes']) : ''; $attributes = !empty($v['attributes']) ? ' ' . ltrim($v[' attributes']) : '';
// Custom icon (see #5541) // Custom icon (see #5541)
if ($v['icon'] ?? null) if ($v['icon'] ?? null)
{ {
$v['class'] = trim($v['class'] . ' header_icon'); $v['class'] = trim($v['class'] . ' header_icon');
// Add the theme path if only the file name is gi ven // Add the theme path if only the file name is gi ven
if (strpos($v['icon'], '/') === false) if (strpos($v['icon'], '/') === false)
{ {
 End of changes. 2 change blocks. 
3 lines changed or deleted 4 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)