From b36ca2848ef9cdb1a3089e98e08e4f1dad265f76 Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Sun, 14 Apr 2013 21:30:04 +0100 Subject: [PATCH] Issue #1885850 by jenlampton: Remove theme_update_page(). --- core/authorize.php | 3 ++- core/includes/theme.inc | 3 --- core/includes/theme.maintenance.inc | 16 ---------------- core/update.php | 6 ++++-- 4 files changed, 6 insertions(+), 22 deletions(-) diff --git a/core/authorize.php b/core/authorize.php index c5336184839..69e19098853 100644 --- a/core/authorize.php +++ b/core/authorize.php @@ -154,5 +154,6 @@ else { } if (!empty($output)) { - print theme('update_page', array('content' => $output, 'show_messages' => $show_messages)); + drupal_add_http_header('Content-Type', 'text/html; charset=utf-8'); + print theme('maintenance_page', array('content' => $output, 'show_messages' => $show_messages)); } diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 9a4f2eef1f7..342c5bcfa5f 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -3214,9 +3214,6 @@ function drupal_common_theme() { 'variables' => array('content' => NULL, 'show_messages' => TRUE), 'template' => 'maintenance-page', ), - 'update_page' => array( - 'variables' => array('content' => NULL, 'show_messages' => TRUE), - ), 'install_page' => array( 'variables' => array('content' => NULL), ), diff --git a/core/includes/theme.maintenance.inc b/core/includes/theme.maintenance.inc index cda4109241c..578d3544c0f 100644 --- a/core/includes/theme.maintenance.inc +++ b/core/includes/theme.maintenance.inc @@ -159,22 +159,6 @@ function theme_install_page($variables) { return theme('maintenance_page', $variables); } -/** - * Returns HTML for the update page. - * - * Note: this function is not themeable. - * - * @param $variables - * An associative array containing: - * - content: The page content to show. - * - show_messages: Whether to output status and error messages. - * FALSE can be useful to postpone the messages to a subsequent page. - */ -function theme_update_page($variables) { - drupal_add_http_header('Content-Type', 'text/html; charset=utf-8'); - return theme('maintenance_page', $variables); -} - /** * Returns HTML for a results report of an operation run by authorize.php. * diff --git a/core/update.php b/core/update.php index e56d08508f5..4947d095fdc 100644 --- a/core/update.php +++ b/core/update.php @@ -390,7 +390,8 @@ function update_check_requirements($skip_warnings = FALSE) { drupal_set_title('Requirements problem'); $status_report = theme('status_report', array('requirements' => $requirements)); $status_report .= 'Check the messages and try again.'; - print theme('update_page', array('content' => $status_report)); + drupal_add_http_header('Content-Type', 'text/html; charset=utf-8'); + print theme('maintenance_page', array('content' => $status_report)); exit(); } } @@ -533,6 +534,7 @@ if (isset($output) && $output) { $output->send(); } else { - print theme('update_page', array('content' => $output, 'show_messages' => !$progress_page)); + drupal_add_http_header('Content-Type', 'text/html; charset=utf-8'); + print theme('maintenance_page', array('content' => $output, 'show_messages' => !$progress_page)); } }