Skip to content

Commit bbb6e22

Browse files
fix: guard against null contentElement in renderer, clean up LANG global in tearDown
1 parent e91d0f7 commit bbb6e22

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

Resources/Public/JavaScript/frontend_edit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@
819819
let failed = 0;
820820

821821
for (let [uid, contentElement] of Object.entries(jsonResponse)) {
822-
if (!contentElement.menu || !contentElement.element) {
822+
if (!contentElement || !contentElement.menu || !contentElement.element) {
823823
Logger.log(`Skipping content element c${uid}: missing menu or element data`, null, 'warn');
824824
failed++;
825825
continue;

Tests/Unit/Service/Menu/ContentElementButtonBuilderTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ protected function setUp(): void
5353
protected function tearDown(): void
5454
{
5555
GeneralUtility::purgeInstances();
56+
unset($GLOBALS['LANG']);
5657
}
5758

5859
#[Test]

0 commit comments

Comments
 (0)