From 62a8bf600e261184649b8893943410f55bfc3fba Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sat, 5 Jun 2010 12:02:33 +0000 Subject: - Patch #807396 by Berdir, carlos8f, David_Rothstein: database errors not displaying during install. --- includes/theme.maintenance.inc | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'includes/theme.maintenance.inc') diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index e602847d1..798a02993 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -141,33 +141,6 @@ function theme_task_list($variables) { */ function theme_install_page($variables) { drupal_add_http_header('Content-Type', 'text/html; charset=utf-8'); - - // Delay setting the message variable so it can be processed below. - $variables['show_messages'] = FALSE; - - // Special handling of error messages - $messages = drupal_set_message(); - if (isset($messages['error'])) { - $title = count($messages['error']) > 1 ? st('The following errors must be resolved before you can continue the installation process') : st('The following error must be resolved before you can continue the installation process'); - $variables['messages'] .= '

' . $title . ':

'; - $variables['messages'] .= theme('status_messages', array('display' => 'error')); - $variables['content'] .= '

' . st('Check the error messages and try again.', array('!url' => check_url(request_uri()))) . '

'; - } - - // Special handling of warning messages - if (isset($messages['warning'])) { - $title = count($messages['warning']) > 1 ? st('The following installation warnings should be carefully reviewed') : st('The following installation warning should be carefully reviewed'); - $variables['messages'] .= '

' . $title . ':

'; - $variables['messages'] .= theme('status_messages', array('display' => 'warning')); - } - - // Special handling of status messages - if (isset($messages['status'])) { - $title = count($messages['status']) > 1 ? st('The following installation warnings should be carefully reviewed, but in most cases may be safely ignored') : st('The following installation warning should be carefully reviewed, but in most cases may be safely ignored'); - $variables['messages'] .= '

' . $title . ':

'; - $variables['messages'] .= theme('status_messages', array('display' => 'status')); - } - return theme('maintenance_page', $variables); } -- cgit v1.2.3