Skip to content

Commit 78055b9

Browse files
Stefan HeimesStefan Heimes
Stefan Heimes
authored and
Stefan Heimes
committed
Merge remote-tracking branch 'hofff/master' into support/contao5
Conflicts: classes/SyncCtoHelper.php src/DcGeneral/Dca/Builder/DataDefinitionBuilder.php src/Resources/contao/config/config.php
2 parents 72ee6d1 + 4e1684b commit 78055b9

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

src/DcGeneral/Dca/Builder/DataDefinitionBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function build(ContainerInterface $container, BuildDataDefinitionEvent $e
7777

7878
// Check if we have to force the diff.
7979
if (
80-
($groupRightForceDiff == true || (\is_array($groupRightForceDiff) && !empty($groupRightForceDiff[0])))
80+
($groupRightForceDiff || (\is_array($groupRightForceDiff) && ($groupRightForceDiff[0] ?? false)))
8181
&& $palettesDefinition
8282
&& $palettesDefinition->hasLegend('table')
8383
&& $palettesDefinition->getLegend('table')->hasProperty('database_pages_check')

src/Resources/contao/config/config.php

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -305,23 +305,27 @@
305305
$GLOBALS['SYC_CONFIG']['table_hidden'] = array_merge(
306306
(array) $GLOBALS['SYC_CONFIG']['table_hidden'],
307307
[
308+
'tl_comments',
309+
'tl_comments_notify',
310+
'tl_crawl_queue',
311+
'tl_cron',
312+
'tl_cron_job',
308313
'tl_files',
309-
'tl_log',
310314
'tl_lock',
311-
'tl_cron',
315+
'tl_log',
312316
'tl_opt_in',
313317
'tl_opt_in_related',
318+
'tl_preview_link',
314319
'tl_remember_me',
315-
'tl_session',
316320
'tl_search',
317321
'tl_search_index',
318-
'tl_undo',
319-
'tl_version',
320-
'tl_comments',
321-
'tl_comments_notify',
322+
'tl_search_term',
323+
'tl_session',
322324
'tl_synccto_clients',
323325
'tl_synccto_stats',
324-
'tl_trusted_device'
326+
'tl_trusted_device',
327+
'tl_undo',
328+
'tl_version'
325329
]
326330
);
327331

@@ -338,6 +342,8 @@
338342
$GLOBALS['SYC_CONFIG']['file_blacklist'] = array_merge(
339343
(array) $GLOBALS['SYC_CONFIG']['file_blacklist'],
340344
[
345+
'config/parameters*',
346+
'TL_ROOT/.env.local',
341347
'TL_ROOT/.env',
342348
'TL_ROOT/.htaccess',
343349
'TL_ROOT/.htpasswd',

0 commit comments

Comments
 (0)