diff options
| -rw-r--r-- | includes/file.inc | 2 | ||||
| -rw-r--r-- | modules/image/image.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/file.inc b/includes/file.inc index c5e5cf07d..971a01983 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -2489,7 +2489,7 @@ function file_get_content_headers($file) { } return array( - 'Content-Type' => $type . '; name="' . $name . '"', + 'Content-Type' => $type, 'Content-Length' => $file->filesize, 'Content-Disposition' => $disposition . '; filename="' . $name . '"', 'Cache-Control' => 'private', diff --git a/modules/image/image.test b/modules/image/image.test index 6a5d20f20..2a3559981 100644 --- a/modules/image/image.test +++ b/modules/image/image.test @@ -748,7 +748,7 @@ class ImageFieldDisplayTestCase extends ImageFieldTestCase { if ($scheme == 'private') { // Only verify HTTP headers when using private scheme and the headers are // sent by Drupal. - $this->assertEqual($this->drupalGetHeader('Content-Type'), 'image/png; name="' . $test_image->filename . '"', t('Content-Type header was sent.')); + $this->assertEqual($this->drupalGetHeader('Content-Type'), 'image/png', t('Content-Type header was sent.')); $this->assertEqual($this->drupalGetHeader('Content-Disposition'), 'inline; filename="' . $test_image->filename . '"', t('Content-Disposition header was sent.')); $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'private', t('Cache-Control header was sent.')); |