diff --git a/news/+reuse-plonelayout.internal.md b/news/+reuse-plonelayout.internal.md new file mode 100644 index 0000000000..dcb487fc5c --- /dev/null +++ b/news/+reuse-plonelayout.internal.md @@ -0,0 +1 @@ +Reuse plone_layout from the main template view. diff --git a/src/Products/CMFPlone/browser/templates/ajax_main_template.pt b/src/Products/CMFPlone/browser/templates/ajax_main_template.pt index 301e760b0a..b81f8ebca0 100644 --- a/src/Products/CMFPlone/browser/templates/ajax_main_template.pt +++ b/src/Products/CMFPlone/browser/templates/ajax_main_template.pt @@ -9,7 +9,7 @@ context_state python:context.restrictedTraverse('@@plone_context_state'); plone_view python:context.restrictedTraverse('@@plone'); icons python:context.restrictedTraverse('@@iconresolver'); - plone_layout python:context.restrictedTraverse('@@plone_layout'); + plone_layout python:view.plone_layout; lang python:portal_state.language(); view nocall:view | nocall: plone_view; dummy python: plone_layout.mark_view(view); diff --git a/src/Products/CMFPlone/browser/templates/main_template.pt b/src/Products/CMFPlone/browser/templates/main_template.pt index efe9eac05e..a4ca0586ac 100644 --- a/src/Products/CMFPlone/browser/templates/main_template.pt +++ b/src/Products/CMFPlone/browser/templates/main_template.pt @@ -9,7 +9,7 @@ context_state python:context.restrictedTraverse('@@plone_context_state'); plone_view python:context.restrictedTraverse('@@plone'); icons python:context.restrictedTraverse('@@iconresolver'); - plone_layout python:context.restrictedTraverse('@@plone_layout'); + plone_layout python:view.plone_layout; lang python:portal_state.language(); view nocall:view | nocall: plone_view; dummy python: plone_layout.mark_view(view);