The database type '. $db_type .' is unsupported. Please use either mysql for MySQL databases or pgsql for PostgreSQL databases. The database information is in your settings.php file.
For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.
'); + exit; } $db_conns[$name] = db_connect($connect_url); Index: includes/database.pgsql.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database.pgsql.inc,v retrieving revision 1.9 diff -u -F^f -r1.9 database.pgsql.inc --- includes/database.pgsql.inc 22 Jun 2005 20:19:58 -0000 1.9 +++ includes/database.pgsql.inc 21 Jul 2005 23:17:20 -0000 @@ -25,7 +25,32 @@ function db_connect($url) { $conn_string = ' user='. $url['user'] .' dbname='. substr($url['path'], 1) .' password='. $url['pass'] . ' host=' . $url['host']; $conn_string .= isset($url['port']) ? ' port=' . $url['port'] : ''; - $connection = pg_connect($conn_string) or die(pg_last_error()); + + // pg_last_error() does not return a useful error message for database + // connection errors. We must turn on error tracking to get at a good error + // message, which will be stored in $php_errormsg. + $track_errors_previous = ini_get('track_errors'); + ini_set('track_errors', 1); + + $connection = @pg_connect($conn_string); + if (!$connection) { + drupal_bootstrap_theme_system(); + drupal_set_title('Unable to connect to database'); + print theme('maintenance_page', 'This either means that the database information in your settings.php file is incorrect or we can\'t contact the PostgreSQL database server. This could mean your hosting provider\'s database server is down.
The PostgreSQL error was: '. $php_errormsg .'
+Currently, the database is '. substr($url['path'], 1) .', the username is '. $url['user'] .', and the database server is '. $url['host'] .'.
For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.
'); + exit; + } + + // Restore error tracking setting + ini_set('track_errors', $track_errors_previous); return $connection; } Index: includes/database.mysql.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database.mysql.inc,v retrieving revision 1.31 diff -u -F^f -r1.31 database.mysql.inc --- includes/database.mysql.inc 22 Jun 2005 20:19:58 -0000 1.31 +++ includes/database.mysql.inc 21 Jul 2005 23:17:20 -0000 @@ -34,9 +34,36 @@ function db_connect($url) { // server. // - 2 means CLIENT_FOUND_ROWS: return the number of found // (matched) rows, not the number of affected rows. - $connection = mysql_connect($url['host'], $url['user'], $url['pass'], TRUE, 2) or die(mysql_error()); - - mysql_select_db(substr($url['path'], 1)) or die('unable to select database'); + $connection = @mysql_connect($url['host'], $url['user'], $url['pass'], TRUE, 2); + if (!$connection) { + drupal_bootstrap_theme_system(); + drupal_set_title('Unable to connect to database server'); + print theme('maintenance_page', 'This either means that the username and password information in your settings.php file is incorrect or we can\'t contact the MySQL database server. This could mean your hosting provider\'s database server is down.
The MySQL error was: '. mysql_error() .'.
+Currently, the username is '. $url['user'] .' and the database server is '. $url['host'] .'.
For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.
'); + exit; + } + + if (!mysql_select_db(substr($url['path'], 1))) { + drupal_bootstrap_theme_system(); + drupal_set_title('Unable to select database'); + print theme('maintenance_page', 'We were able to connect to the MySQL database server (which means your username and password is okay) but not able to select the database.
+The MySQL error was: '. mysql_error() .'.
+Currently, the database is '. substr($url['path'], 1) .'. The username is '. $url['user'] .' and the database server is '. $url['host'] .'.
For more help, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.
'); + exit; + } return $connection; } Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.245 diff -u -F^f -r1.245 theme.inc --- includes/theme.inc 2 Jul 2005 12:32:09 -0000 1.245 +++ includes/theme.inc 21 Jul 2005 23:17:20 -0000 @@ -160,7 +160,7 @@ function list_theme_engines($refresh = F function theme() { global $theme, $theme_engine; - if (!$theme) { + if (is_null($theme)) { // Initialize the enabled theme. $theme = init_theme(); } @@ -440,6 +440,30 @@ function theme_page($content) { return $output; } +function theme_maintenance_page($content) { + theme('add_style', 'misc/drupal.css'); + theme('add_style', 'misc/maintenance.css'); + $output = "\n"; + $output .= ''; + $output .= ''; + $output .= ''; + $output .= '