Issue backdrop#4613: Cleanup layout.context.admin.inc inclusion.

By @docwilmot, @indigoxela, @BWPanda, and @klonos.
kiamlaluno · Oct 17, 2020 · fa87056 · fa87056
1 parent 74805d1
commit fa87056
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/core/modules/layout/layout.admin.inc b/core/modules/layout/layout.admin.inc
@@ -6,8 +6,6 @@
  * This provides the UI to list, create, edit and delete layouts.
  */
 
-module_load_include('inc', 'layout', 'layout.context.admin');
-
 /**
  * Output a list of pages that are managed.
  */
@@ -212,6 +210,7 @@ function layout_add_page() {
  */
 function layout_settings_form($form, &$form_state, Layout $layout) {
   form_load_include($form_state, 'inc', 'layout', 'layout.admin');
+  form_load_include($form_state, 'inc', 'layout', 'layout.context.admin');
 
   $form_state['layout'] = &$layout;
   $form['#tree'] = TRUE;

diff --git a/core/modules/layout/layout.context.admin.inc b/core/modules/layout/layout.context.admin.inc
@@ -1,6 +1,8 @@
 <?php
-module_load_include('inc', 'layout', 'layout.admin');
-
+/**
+ * @file
+ * Administrative functions for custom layout contexts.
+ */
 
 /**
  * Submit handler for layout_settings_form() that lets the user add a context.
@@ -27,6 +29,7 @@ function layout_settings_form_context_add($form, &$form_state) {
  * @ingroup forms
  */
 function layout_context_add_form($form, &$form_state, Layout $layout = NULL, $context_id = NULL) {
+  form_load_include($form_state, 'inc', 'layout', 'layout.context.admin');
   form_load_include($form_state, 'inc', 'layout', 'layout.admin');
 
   $is_new_context = TRUE;
@@ -145,6 +148,7 @@ function layout_context_add_load_context_nojs($form, &$form_state) {
  * Helper function to return a partial context settings form.
  */
 function layout_context_return_form($form, &$form_state) {
+  form_load_include($form_state, 'inc', 'layout', 'layout.context.admin');
   $layout = $form_state['layout'];
 
   // If no context has yet been selected, there is no sub-form to display.

diff --git a/core/modules/layout/layout.module b/core/modules/layout/layout.module
@@ -336,7 +336,7 @@ function layout_menu() {
     'page callback' => 'backdrop_get_form',
     'page arguments' => array('layout_context_add_form', 4),
     'type' => MENU_CALLBACK,
-    'file' => 'layout.admin.inc',
+    'file' => 'layout.context.admin.inc',
   ) + $base;
 
   $items['admin/structure/layouts/manage/%layout_tempstore/context/edit/layout/%'] = array(
@@ -345,7 +345,7 @@ function layout_menu() {
     'page callback' => 'backdrop_get_form',
     'page arguments' => array('layout_context_add_form', 4, 8),
     'type' => MENU_CALLBACK,
-    'file' => 'layout.admin.inc',
+    'file' => 'layout.context.admin.inc',
   ) + $base;
 
   $items['admin/structure/layouts/manage/%layout_tempstore/condition/add'] = array(