diff --git a/config/listener.yaml b/config/listener.yaml
index 19348c6a2b..9b42bb24c4 100644
--- a/config/listener.yaml
+++ b/config/listener.yaml
@@ -525,11 +525,6 @@ services:
arguments:
- '@monolog.logger.contao.error'
- contao.messenger.worker_listener:
- class: Contao\CoreBundle\Messenger\EventListener\WorkerListener
- arguments:
- - '@contao.messenger.auto_fallback_notifier'
-
contao.twig.loader.auto_refresh_template_hierarchy_listener:
class: Contao\CoreBundle\Twig\Loader\AutoRefreshTemplateHierarchyListener
arguments:
diff --git a/config/services.yaml b/config/services.yaml
index 1680229c73..0acf294f9a 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -415,6 +415,7 @@ services:
contao.assets.files_context: '@contao.assets.files_context'
contao.routing.page_finder: '@contao.routing.page_finder'
contao.framework: '@contao.framework'
+ contao.filesystem.virtual.files: '@contao.filesystem.virtual.files'
event_dispatcher: '@event_dispatcher'
- '%kernel.project_dir%'
- '%contao.upload_path%'
@@ -472,7 +473,7 @@ services:
contao.insert_tag.resolver.if_language:
class: Contao\CoreBundle\InsertTag\Resolver\IfLanguageInsertTag
arguments:
- - '@request_stack'
+ - '@translator'
contao.insert_tag.resolver.legacy:
class: Contao\CoreBundle\InsertTag\Resolver\LegacyInsertTag
@@ -549,23 +550,18 @@ services:
arguments:
- '@contao.menu.matcher'
- contao.messenger.auto_fallback_notifier:
- class: Contao\CoreBundle\Messenger\AutoFallbackNotifier
- arguments:
- - '@cache.app'
- - '@messenger.receiver_locator'
-
- contao.messenger.auto_fallback_transport_factory:
- class: Contao\CoreBundle\Messenger\Transport\AutoFallbackTransportFactory
- arguments:
- - '@contao.messenger.auto_fallback_notifier'
- - '@messenger.receiver_locator'
-
contao.messenger.search_index_message_handler:
class: Contao\CoreBundle\Messenger\MessageHandler\SearchIndexMessageHandler
arguments:
- '@?contao.search.indexer'
+ contao.messenger.web_worker:
+ class: Contao\CoreBundle\Messenger\WebWorker
+ arguments:
+ - '@cache.app'
+ - '@console.command.messenger_consume_messages'
+ - '@messenger.receiver_locator'
+
contao.model_argument_resolver:
class: Contao\CoreBundle\HttpKernel\ModelArgumentResolver
arguments:
diff --git a/contao/dca/tl_article.php b/contao/dca/tl_article.php
index 41cc25a7f0..0a5ebe1132 100644
--- a/contao/dca/tl_article.php
+++ b/contao/dca/tl_article.php
@@ -101,8 +101,6 @@
(
'id' => array
(
- 'label' => array('ID'),
- 'search' => true,
'sql' => "int(10) unsigned NOT NULL auto_increment"
),
'pid' => array
diff --git a/contao/dca/tl_content.php b/contao/dca/tl_content.php
index 7d822ad28b..600c5c6829 100644
--- a/contao/dca/tl_content.php
+++ b/contao/dca/tl_content.php
@@ -167,8 +167,7 @@
(
'id' => array
(
- 'sql' => "int(10) unsigned NOT NULL auto_increment",
- 'search' => true
+ 'sql' => "int(10) unsigned NOT NULL auto_increment"
),
'pid' => array
(
diff --git a/contao/dca/tl_favorites.php b/contao/dca/tl_favorites.php
index e497f6ab7f..f222117028 100644
--- a/contao/dca/tl_favorites.php
+++ b/contao/dca/tl_favorites.php
@@ -60,8 +60,6 @@
(
'id' => array
(
- 'label' => array('ID'),
- 'search' => true,
'sql' => "int(10) unsigned NOT NULL auto_increment"
),
'pid' => array
diff --git a/contao/dca/tl_module.php b/contao/dca/tl_module.php
index 0b2488973f..4a0f3d88b9 100644
--- a/contao/dca/tl_module.php
+++ b/contao/dca/tl_module.php
@@ -106,7 +106,6 @@
(
'id' => array
(
- 'search' => true,
'sql' => "int(10) unsigned NOT NULL auto_increment"
),
'pid' => array
diff --git a/contao/dca/tl_page.php b/contao/dca/tl_page.php
index 97ee76ed66..4cb7b2e8e1 100644
--- a/contao/dca/tl_page.php
+++ b/contao/dca/tl_page.php
@@ -145,8 +145,6 @@
(
'id' => array
(
- 'label' => array('ID'),
- 'search' => true,
'sql' => "int(10) unsigned NOT NULL auto_increment"
),
'pid' => array
diff --git a/contao/drivers/DC_Folder.php b/contao/drivers/DC_Folder.php
index 0b503aae2e..aa0e4ccad1 100644
--- a/contao/drivers/DC_Folder.php
+++ b/contao/drivers/DC_Folder.php
@@ -602,24 +602,19 @@ public function showAll()
)) . ')'
;
- if (isset($GLOBALS['TL_DCA'][$this->strTable]['list']['global_operations']['toggleNodes']))
- {
- $return = '' . $return . '
';
- }
-
- return $return;
+ return '' . $return . '
';
}
/**
@@ -2748,7 +2743,7 @@ protected function generateTree($path, $intMargin, $mount=false, $blnProtected=t
}
}
- $return .= '';
+ $return .= '';
// Call the next node
if (!empty($content) && $blnIsOpen)
@@ -2849,7 +2844,7 @@ protected function generateTree($path, $intMargin, $mount=false, $blnProtected=t
}
}
- $return .= $_buttons . '';
+ $return .= $_buttons . '';
}
return $return;
diff --git a/contao/drivers/DC_Table.php b/contao/drivers/DC_Table.php
index 927c3fdbb6..df3f29eb26 100644
--- a/contao/drivers/DC_Table.php
+++ b/contao/drivers/DC_Table.php
@@ -392,6 +392,15 @@ public function showAll()
);
$objSession->set('CLIPBOARD', $arrClipboard);
+
+ if ($this->currentPid)
+ {
+ $this->redirect(Backend::addToUrl('id=' . $this->currentPid, false, array('act', 'mode')));
+ }
+ else
+ {
+ $this->redirect(Backend::addToUrl('', false, array('act', 'mode', 'id')));
+ }
}
// Custom filter
@@ -3950,7 +3959,7 @@ protected function treeView()
$breadcrumb = $GLOBALS['TL_DCA'][$table]['list']['sorting']['breadcrumb'] ?? '';
// Return if there are no records
- if (!$tree && Input::get('act') != 'paste')
+ if (!$tree && !$blnClipboard)
{
if ($breadcrumb)
{
@@ -4092,25 +4101,20 @@ protected function treeView()
';
}
- if (isset($GLOBALS['TL_DCA'][$this->strTable]['list']['global_operations']['toggleNodes']))
- {
- $return = '' . $return . '
';
- }
-
- return $return;
+ return '' . $return . '
';
}
/**
@@ -4326,7 +4330,7 @@ protected function generateTree($table, $id, $arrPrevNext, $blnHasSorting, $intM
{
$mouseover = ' toggle_select hover-div';
}
- elseif (($GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['mode'] ?? null) == self::MODE_TREE_EXTENDED && Input::get('act') == 'paste')
+ elseif (($GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['mode'] ?? null) == self::MODE_TREE_EXTENDED && $arrClipboard !== false)
{
$mouseover = ' hover-div';
}
@@ -4604,7 +4608,7 @@ protected function parentView()