Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1885850 by jenlampton: Remove theme_update_page().

8.0.x
Alex Pott 2013-04-14 21:30:04 +01:00
parent c95875b0ae
commit b36ca2848e
4 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/authorize.php
View File

@ -154,5 +154,6 @@ else {
} }
if (!empty($output)) { 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));
} }

3
core/includes/theme.inc
View File

@ -3214,9 +3214,6 @@ function drupal_common_theme() {
'variables' => array('content' => NULL, 'show_messages' => TRUE), 'variables' => array('content' => NULL, 'show_messages' => TRUE),
'template' => 'maintenance-page', 'template' => 'maintenance-page',
), ),
'update_page' => array(
'variables' => array('content' => NULL, 'show_messages' => TRUE),
),
'install_page' => array( 'install_page' => array(
'variables' => array('content' => NULL), 'variables' => array('content' => NULL),
), ),

16
core/includes/theme.maintenance.inc
View File

@ -159,22 +159,6 @@ function theme_install_page($variables) {
return theme('maintenance_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. * Returns HTML for a results report of an operation run by authorize.php.
* *

6
core/update.php
View File

@ -390,7 +390,8 @@ function update_check_requirements($skip_warnings = FALSE) {
drupal_set_title('Requirements problem'); drupal_set_title('Requirements problem');
$status_report = theme('status_report', array('requirements' => $requirements)); $status_report = theme('status_report', array('requirements' => $requirements));
$status_report .= 'Check the messages and <a href="' . check_url(drupal_requirements_url($severity)) . '">try again</a>.'; $status_report .= 'Check the messages and <a href="' . check_url(drupal_requirements_url($severity)) . '">try again</a>.';
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(); exit();
} }
} }
@ -533,6 +534,7 @@ if (isset($output) && $output) {
$output->send(); $output->send();
} }
else { 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));
} }
} }