diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 7c48116..80dcec2 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -769,7 +769,7 @@ function install_tasks($install_state) { * Returns a list of tasks that should be displayed to the end user. * * The output of this function is a list suitable for sending to - * theme_task_list(). + * maintenance-task-list.html.twig. * * @param $install_state * An array of information about the current installation state. @@ -778,7 +778,7 @@ function install_tasks($install_state) { * A list of tasks, with keys equal to the machine-readable task name and * values equal to the name that should be displayed. * - * @see theme_task_list() + * @see maintenance-task-list.html.twig */ function install_tasks_to_display($install_state) { $displayed_tasks = array(); @@ -915,7 +915,7 @@ function install_display_output($output, $install_state) { // been completed. $active_task = $install_state['installation_finished'] ? NULL : $install_state['active_task']; $task_list = array( - '#theme' => 'task_list', + '#theme' => 'maintenance_task_list', '#items' => install_tasks_to_display($install_state), '#active' => $active_task, ); diff --git a/core/includes/theme.inc b/core/includes/theme.inc index d10ce95..681a27e 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1553,7 +1553,7 @@ function template_preprocess_container(&$variables) { * dangerous HTML such as SCRIPT tags. * - active: The key for the currently active maintenance task. */ -function template_preprocess_task_list(&$variables) { +function template_preprocess_maintenance_task_list(&$variables) { $items = $variables['items']; $active = $variables['active']; @@ -2306,9 +2306,9 @@ function drupal_common_theme() { 'render element' => 'page', 'template' => 'install-page', ), - 'task_list' => array( + 'maintenance_task_list' => array( 'variables' => array('items' => NULL, 'active' => NULL, 'variant' => NULL), - 'template' => 'task-list', + 'template' => 'maintenance-task-list', ), 'authorize_message' => array( 'variables' => array('message' => NULL, 'success' => TRUE), diff --git a/core/modules/system/src/Controller/DbUpdateController.php b/core/modules/system/src/Controller/DbUpdateController.php index da7e4c3..2f98772 100644 --- a/core/modules/system/src/Controller/DbUpdateController.php +++ b/core/modules/system/src/Controller/DbUpdateController.php @@ -506,7 +506,7 @@ protected function updateTasksList($active = NULL) { ); $task_list = array( - '#theme' => 'task_list', + '#theme' => 'maintenance_task_list', '#items' => $tasks, '#active' => $active, ); diff --git a/core/modules/system/templates/task-list.html.twig b/core/modules/system/templates/maintenance-task-list.html.twig similarity index 100% rename from core/modules/system/templates/task-list.html.twig rename to core/modules/system/templates/maintenance-task-list.html.twig