--- includes/database/pgsql/database.inc Sat Sep 20 17:43:32 2008 +++ includes/database/pgsql/database.inc Tue Sep 30 22:12:05 2008 @@ -62 +62 @@ - _db_need_install(); + _drupal_install_required(); --- includes/database/database.inc Mon Sep 29 19:28:09 2008 +++ includes/database/database.inc Tue Sep 30 22:12:05 2008 @@ -356 +356 @@ - _db_need_install(); + _drupal_install_required(); @@ -757,3 +756,0 @@ - if (empty($databases)) { - _db_need_install(); - } @@ -878 +875 @@ - _db_need_install(); + _drupal_install_required(); @@ -1862,7 +1858,0 @@ -} - -function _db_need_install() { - if (!function_exists('install_goto')) { - include_once DRUPAL_ROOT . '/includes/install.inc'; - install_goto('install.php'); - } --- includes/bootstrap.inc Sat Sep 20 17:42:26 2008 +++ includes/bootstrap.inc Tue Sep 30 22:12:05 2008 @@ -365,0 +366,6 @@ + // If the $databases configuration array has not been populated, then + // an installation is required. + if (empty($databases)) { + _drupal_install_required(); + } + @@ -1085,0 +1092,9 @@ +/** + * Send the user to the installer page. + */ +function _drupal_install_required() { + if (!function_exists('install_goto')) { + include_once DRUPAL_ROOT . '/includes/install.inc'; + install_goto('install.php'); + } +} --- includes/install.inc Tue Sep 30 23:42:47 2008 +++ includes/install.inc Wed Oct 01 09:02:56 2008 @@ -207,0 +208,5 @@ + + // Initialize the database system if it has not been + // initialized yet. We do not initialize it earlier to make + // requirements check during the installation. + require_once DRUPAL_ROOT . '/includes/database/database.inc'; --- includes/theme.inc Sat Sep 20 17:42:28 2008 +++ includes/theme.inc Tue Sep 30 22:16:54 2008 @@ -438 +438 @@ - if (db_is_active() && !defined('MAINTENANCE_MODE')) { + if (!defined('MAINTENANCE_MODE') && db_is_active()) { --- includes/theme.maintenance.inc Tue Sep 30 23:42:47 2008 +++ includes/theme.maintenance.inc Tue Sep 30 23:31:53 2008 @@ -31 +30,0 @@ - require_once DRUPAL_ROOT . '/includes/database/database.inc'; --- install.php Tue Sep 30 23:42:47 2008 +++ install.php Wed Oct 01 09:44:39 2008 @@ -899 +899,17 @@ - + + // Check if the PDO library is available. + if (class_exists('PDO') && method_exists('PDO', 'query') && class_exists('PDOStatement') && class_exists('PDOException')) { + $requirements['pdo'] = array( + 'title' => st('PDO database API'), + 'value' => st('PDO extension enabled.'), + ); + } + else { + $requirements['pdo'] = array( + 'title' => st('PDO database API'), + 'value' => st('PDO extension not enabled.'), + 'severity' => REQUIREMENT_ERROR, + 'description' => st('We were unable to find the PDO libray required by the databse API. See the PHP PDO installation page for instructions on how to enable PDO to continue with the installation process.', array('@pdo' => 'http://us.php.net/manual/en/pdo.installation.php')), + ); + } +