Skip to content

Commit

Permalink
Fix contao bug description label
Browse files Browse the repository at this point in the history
  • Loading branch information
zonky2 committed Apr 25, 2024
1 parent 39d7dc3 commit 9952d2f
Showing 1 changed file with 17 additions and 12 deletions.
29 changes: 17 additions & 12 deletions src/Subscribers/WidgetSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* This file is part of contao-community-alliance/events-contao-bindings
*
* (c) 2014-2018 The Contao Community Alliance
* (c) 2014-2024 The Contao Community Alliance
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -14,7 +14,8 @@
* @subpackage Subscribers
* @author Christian Schiffler <[email protected]>
* @author Sven Baumann <[email protected]>
* @copyright 2018 The Contao Community Alliance.
* @author Ingolf Steinhardt <[email protected]>
* @copyright 2014-2024 The Contao Community Alliance.
* @license https://github.com/contao-community-alliance/events-contao-bindings/blob/master/LICENSE LGPL-3.0
* @filesource
*/
Expand Down Expand Up @@ -70,16 +71,20 @@ public function handleGetAttributesFromDca(GetAttributesFromDcaEvent $event): vo
* @psalm-suppress InternalMethod - getAdapter is the official way and NOT internal.
*/
$widgetAdapter = $this->framework->getAdapter(Widget::class);

$event->setResult(
$widgetAdapter->getAttributesFromDca(
$event->getFieldConfiguration(),
$event->getWidgetName(),
$event->getValue(),
$event->getWidgetId(),
$event->getTable(),
$event->getDataContainer()
)
$result = $widgetAdapter->getAttributesFromDca(
$event->getFieldConfiguration(),
$event->getWidgetName(),
$event->getValue(),
$event->getWidgetId(),
$event->getTable(),
$event->getDataContainer()
);

// Bugfix: Contao does not validate for label array when determining the description.
if (strlen($result['description']) === 1 && !\is_array($event->getFieldConfiguration()['label'] ?? null)) {
$result['description'] = '';
}

$event->setResult($result);
}
}

0 comments on commit 9952d2f

Please sign in to comment.