Skip to content

Commit

Permalink
Merge tag '2.3.12'
Browse files Browse the repository at this point in the history
Hotfix release 2.3.13

Fix picker for pages and load language file
  • Loading branch information
stefanheimes committed May 27, 2024
2 parents fb7624e + 0831676 commit 40eb682
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/Contao/Picker/PagePickerProvider.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/dc-general.
*
* (c) 2013-2019 Contao Community Alliance.
* (c) 2013-2024 Contao Community Alliance.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -12,7 +12,7 @@
*
* @package contao-community-alliance/dc-general
* @author Sven Baumann <[email protected]>
* @copyright 2013-2019 Contao Community Alliance.
* @copyright 2013-2024 Contao Community Alliance.
* @license https://github.com/contao-community-alliance/dc-general/blob/master/LICENSE LGPL-3.0-or-later
* @filesource
*/
Expand Down Expand Up @@ -67,7 +67,7 @@ public function __construct(
*/
public function getName()
{
return 'pagePicker';
return 'ccaPagePicker';
}

/**
Expand Down
5 changes: 3 additions & 2 deletions src/Controller/BackendTreeController.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/dc-general.
*
* (c) 2013-2023 Contao Community Alliance.
* (c) 2013-2024 Contao Community Alliance.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -15,7 +15,7 @@
* @author Sven Baumann <[email protected]>
* @author Kim Wormer <[email protected]>
* @author Ingolf Steinhardt <[email protected]>
* @copyright 2013-2023 Contao Community Alliance.
* @copyright 2013-2024 Contao Community Alliance.
* @license https://github.com/contao-community-alliance/dc-general/blob/master/LICENSE LGPL-3.0-or-later
* @filesource
*/
Expand Down Expand Up @@ -135,6 +135,7 @@ private function initializeAndExtractRequest(): Request
$controller = $framework->getAdapter(Controller::class);
/** @psalm-suppress DeprecatedMethod */
$controller->setStaticUrls();
$controller->loadLanguageFile('default');

$requestStack = $container->get('request_stack');
assert($requestStack instanceof RequestStack);
Expand Down

0 comments on commit 40eb682

Please sign in to comment.