diff --git a/.gitignore b/.gitignore index baff153..875e339 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ sites/*/settings*.php # Ignore paths that contain user-generated content. sites/*/files sites/*/private + +sites/ diff --git a/includes/common.inc b/includes/common.inc index 1f90704..ba94fd6 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -991,12 +991,9 @@ function drupal_http_request($url, array $options = array()) { // Parse the response status line. $response_status_array = _drupal_parse_response_status(trim(array_shift($response))); - $protocol = $response_status_array['http_version']; + $result->protocol = $response_status_array['http_version']; + $result->status_message = $response_status_array['reason_phrase']; $code = $response_status_array['response_code']; - $status_message = $response_status_array['reason_phrase']; - - $result->protocol = $protocol; - $result->status_message = $status_message; $result->headers = array(); @@ -1087,7 +1084,7 @@ function drupal_http_request($url, array $options = array()) { } break; default: - $result->error = $status_message; + $result->error = $result->status_message; } return $result;