diff options
Diffstat (limited to 'modules/system/system.install')
| -rw-r--r-- | modules/system/system.install | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/modules/system/system.install b/modules/system/system.install index 5b73c4b87..7e3714aa9 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -256,8 +256,8 @@ function system_requirements($phase) { include_once DRUPAL_ROOT . '/includes/unicode.inc'; $requirements = array_merge($requirements, unicode_requirements()); - // Check for update status module. if ($phase == 'runtime') { + // Check for update status module. if (!module_exists('update')) { $requirements['update status'] = array( 'value' => $t('Not enabled'), @@ -269,16 +269,18 @@ function system_requirements($phase) { $requirements['update status'] = array( 'value' => $t('Enabled'), ); - if (variable_get('drupal_http_request_fails', FALSE)) { - $requirements['http requests'] = array( - 'title' => $t('HTTP request status'), - 'value' => $t('Fails'), - 'severity' => REQUIREMENT_ERROR, - 'description' => $t('Your system or network configuration does not allow Drupal to access web pages, resulting in reduced functionality. This could be due to your webserver configuration or PHP settings, and should be resolved in order to download information about available updates, fetch aggregator feeds, sign in via OpenID, or use other network-dependent services.'), - ); - } } $requirements['update status']['title'] = $t('Update notifications'); + + // Check that Drupal can issue HTTP requests. + if (variable_get('drupal_http_request_fails', TRUE) && !system_check_http_request()) { + $requirements['http requests'] = array( + 'title' => $t('HTTP request status'), + 'value' => $t('Fails'), + 'severity' => REQUIREMENT_ERROR, + 'description' => $t('Your system or network configuration does not allow Drupal to access web pages, resulting in reduced functionality. This could be due to your webserver configuration or PHP settings, and should be resolved in order to download information about available updates, fetch aggregator feeds, sign in via OpenID, or use other network-dependent services. If you are certain that Drupal can access web pages but you are still seeing this message, you may add <code>$conf[\'drupal_http_request_fails\'] = FALSE;</code> to the bottom of your settings.php file.'), + ); + } } return $requirements; |