summaryrefslogtreecommitdiff
path: root/includes/theme.maintenance.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-06-05 12:02:33 +0000
committerDries Buytaert <dries@buytaert.net>2010-06-05 12:02:33 +0000
commit62a8bf600e261184649b8893943410f55bfc3fba (patch)
treeb539f32f8973b2df06fe4df58ad911f8a8defa8f /includes/theme.maintenance.inc
parent4b2566652003965b7d6ab1bc5e5472aad6d50c68 (diff)
downloadbrdo-62a8bf600e261184649b8893943410f55bfc3fba.tar.gz
brdo-62a8bf600e261184649b8893943410f55bfc3fba.tar.bz2
- Patch #807396 by Berdir, carlos8f, David_Rothstein: database errors not displaying during install.
Diffstat (limited to 'includes/theme.maintenance.inc')
-rw-r--r--includes/theme.maintenance.inc27
1 files changed, 0 insertions, 27 deletions
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'] .= '<h3>' . $title . ':</h3>';
- $variables['messages'] .= theme('status_messages', array('display' => 'error'));
- $variables['content'] .= '<p>' . st('Check the error messages and <a href="!url">try again</a>.', array('!url' => check_url(request_uri()))) . '</p>';
- }
-
- // 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'] .= '<h4>' . $title . ':</h4>';
- $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'] .= '<h4>' . $title . ':</h4>';
- $variables['messages'] .= theme('status_messages', array('display' => 'status'));
- }
-
return theme('maintenance_page', $variables);
}