diff --git includes/install.inc includes/install.inc index 346cc6c..53eed8f 100644 --- includes/install.inc +++ includes/install.inc @@ -208,6 +208,11 @@ function drupal_detect_baseurl($file = 'install.php') { function drupal_detect_database_types() { $databases = array(); + // 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'; + // We define a driver as a directory in /includes/database that in turn // contains a database.inc file. That allows us to drop in additional drivers // without modifying the installer. diff --git includes/theme.inc includes/theme.inc index ff3c546..59368e0 100644 --- includes/theme.inc +++ includes/theme.inc @@ -571,7 +571,7 @@ function list_themes($refresh = FALSE) { $themes = array(); // Extract from the database only when it is available. // Also check that the site is not in the middle of an install or update. - if (db_is_active() && !defined('MAINTENANCE_MODE')) { + if (!defined('MAINTENANCE_MODE') && db_is_active()) { foreach (system_list('theme') as $theme) { if (file_exists($theme->filename)) { $theme->info = unserialize($theme->info); diff --git includes/theme.maintenance.inc includes/theme.maintenance.inc index f8c211e..adcd4d8 100644 --- includes/theme.maintenance.inc +++ includes/theme.maintenance.inc @@ -28,7 +28,6 @@ function _drupal_maintenance_theme() { require_once DRUPAL_ROOT . '/includes/unicode.inc'; require_once DRUPAL_ROOT . '/includes/file.inc'; require_once DRUPAL_ROOT . '/includes/module.inc'; - require_once DRUPAL_ROOT . '/includes/database/database.inc'; unicode_check(); // Install and update pages are treated differently to prevent theming overrides. @@ -39,6 +38,7 @@ function _drupal_maintenance_theme() { if (!db_is_active()) { // Because we are operating in a crippled environment, we need to // bootstrap just enough to allow hook invocations to work. + require_once DRUPAL_ROOT . '/includes/database/database.inc'; $module_list['system']['filename'] = 'modules/system/system.module'; module_list(TRUE, FALSE, FALSE, $module_list); drupal_load('module', 'system'); diff --git install.php install.php index 2ea7810..edc01ca 100644 --- install.php +++ install.php @@ -791,7 +791,7 @@ function install_verify_settings() { global $db_prefix, $databases; // Verify existing settings (if any). - if (!empty($databases)) { + if (!empty($databases) && install_verify_pdo()) { $database = $databases['default']['default']; drupal_static_reset('conf_path'); $settings_file = './' . conf_path(FALSE) . '/settings.php'; @@ -804,6 +804,13 @@ function install_verify_settings() { } /** + * Verify PDO library. + */ +function install_verify_pdo() { + return extension_loaded('pdo'); +} + +/** * Installation task; define a form to configure and rewrite settings.php. * * @param $form_state diff --git modules/system/system.install modules/system/system.install index c4e1010..acadba8 100644 --- modules/system/system.install +++ modules/system/system.install @@ -94,6 +94,19 @@ function system_requirements($phase) { else { $requirements['php_register_globals']['value'] = $t('Disabled'); } + + // Test PDO library availability. + $requirements['pdo'] = array( + 'title' => $t('PDO library'), + ); + if (extension_loaded('pdo')) { + $requirements['pdo']['value'] = $t('Enabled'); + } + else { + $requirements['pdo']['value'] = $t('Disabled'); + $requirements['pdo']['severity'] = REQUIREMENT_ERROR; + $requirements['pdo']['description'] = $t('Your server does not have the PHP PDO extension enabled. See the system requirements page for more information.', array('@system_requirements' => 'http://drupal.org/requirements')); + } // Test PHP memory_limit $memory_limit = ini_get('memory_limit');