Merge branch 'upstream' into 5.0

contao · Dec 13, 2022 · bb87ef7 · bb87ef7
2 parents 6092016 + 56bf0f8
commit bb87ef7
Show file tree

Hide file tree

Showing 5 changed files with 260 additions and 269 deletions.
diff --git a/core-bundle/contao/templates/backend/be_tinyMCE.html5 b/core-bundle/contao/templates/backend/be_tinyMCE.html5
@@ -52,7 +52,7 @@ window.tinymce && tinymce.init({
   <?php $this->endblock(); ?>
 
   <?php $this->block('valid_elements'); ?>
-    extended_valid_elements: 'q[cite|class|title],article,section,hgroup,figure,figcaption',
+    extended_valid_elements: 'q[cite|class|title],article,section,hgroup,figure,figcaption,a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|data-lightbox]',
   <?php $this->endblock(); ?>
 
   <?php $this->block('menubar'); ?>

diff --git a/core-bundle/src/Controller/SitemapController.php b/core-bundle/src/Controller/SitemapController.php
@@ -108,6 +108,9 @@ private function getPageAndArticleUrls(int $parentPageId): array
 
         // Recursively walk through all subpages
         foreach ($pageModels as $pageModel) {
+            // Load details in order to inherit permission settings (see #5556)
+            $pageModel->loadDetails();
+
             if ($pageModel->protected && !$this->isGranted(ContaoCorePermissions::MEMBER_IN_GROUPS, $pageModel->groups)) {
                 continue;
             }

diff --git a/core-bundle/src/Twig/Loader/ContaoFilesystemLoaderWarmer.php b/core-bundle/src/Twig/Loader/ContaoFilesystemLoaderWarmer.php
@@ -84,7 +84,7 @@ public function refresh(): void
      */
     public function onKernelRequest(RequestEvent $event): void
     {
-        if ('dev' === $this->environment) {
+        if ('dev' === $this->environment && $event->isMainRequest()) {
             $this->refresh();
         }
     }