CS

contao · Jul 6, 2022 · 62f6c80 · 62f6c80
1 parent 5394639
commit 62f6c80
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core-bundle/src/Resources/contao/drivers/DC_Folder.php b/core-bundle/src/Resources/contao/drivers/DC_Folder.php
@@ -2521,8 +2521,6 @@ protected function generateTree($path, $intMargin, $mount=false, $blnProtected=t
 		$objSessionBag = System::getContainer()->get('session')->getBag('contao_backend');
 		$session = $objSessionBag->all();
 
-		$security = System::getContainer()->get('security.helper');
-
 		// Get the session data and toggle the nodes
 		if (Input::get('tg'))
 		{
@@ -2580,6 +2578,8 @@ protected function generateTree($path, $intMargin, $mount=false, $blnProtected=t
 			$files = array_values($files);
 		}
 
+		$security = System::getContainer()->get('security.helper');
+
 		// Folders
 		for ($f=0, $c=\count($folders); $f<$c; $f++)
 		{

diff --git a/core-bundle/src/Resources/contao/drivers/DC_Table.php b/core-bundle/src/Resources/contao/drivers/DC_Table.php
@@ -4090,7 +4090,7 @@ protected function generateTree($table, $id, $arrPrevNext, $blnHasSorting, $intM
 				// Regular tree
 				if (($GLOBALS['TL_DCA'][$this->strTable]['list']['sorting']['mode'] ?? null) == self::MODE_TREE)
 				{
-					// on cut: disable buttons of the page and all its childs to avoid circular references
+					// Disable buttons of the page and all its children on cut to avoid circular references
 					if (($arrClipboard['mode'] == 'cut' && ($blnCircularReference || $arrClipboard['id'] == $id)) || ($arrClipboard['mode'] == 'cutAll' && ($blnCircularReference || \in_array($id, $arrClipboard['id']))))
 					{
 						$_buttons .= Image::getHtml('pasteafter_.svg') . ' ' . Image::getHtml('pasteinto_.svg') . ' ';