diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index f1e0be1..c4ad56d 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -766,7 +766,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(). + * theme_maintenance_task_list(). * * @param $install_state * An array of information about the current installation state. @@ -775,7 +775,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 theme_maintenance_task_list() */ function install_tasks_to_display($install_state) { $displayed_tasks = array(); @@ -912,7 +912,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 b8c1288..2580765 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1575,7 +1575,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']; @@ -2352,7 +2352,7 @@ 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' => 'maintenance-task-list', ), diff --git a/core/modules/system/src/Controller/DbUpdateController.php b/core/modules/system/src/Controller/DbUpdateController.php index 62752ae..f6544ac 100644 --- a/core/modules/system/src/Controller/DbUpdateController.php +++ b/core/modules/system/src/Controller/DbUpdateController.php @@ -477,7 +477,7 @@ protected function updateTasksList($active = NULL) { ); $task_list = array( - '#theme' => 'task_list', + '#theme' => 'maintenance_task_list', '#items' => $tasks, '#active' => $active, );