From 0d56582b4634af4e9a8c2e23531c93756c143db2 Mon Sep 17 00:00:00 2001 From: Jordan Dukart Date: Tue, 21 Aug 2012 15:08:05 -0300 Subject: [PATCH 1/2] Fix for handle/download resolves in IE8. Removal of previous such that it is contained in one line. --- ObjectHelper.inc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ObjectHelper.inc b/ObjectHelper.inc index 494d1efe..a16474d9 100644 --- a/ObjectHelper.inc +++ b/ObjectHelper.inc @@ -178,12 +178,13 @@ class ObjectHelper { if ($curl_stat !== FALSE) { $info = curl_getinfo($ch); - + // Fixes an IE issue (ISLANDORA-311) + // http://support.microsoft.com/kb/316431 + drupal_set_header("Cache-Control: private", TRUE); + //Set what headers we can... if ($mimeType = $info['content_type']) { drupal_set_header("Content-Type: $mimeType"); - // Fixes an IE issue - drupal_set_header("Cache-Control: private", TRUE); if ($asAttachment) { $suggestedFileName = "$label"; $pos = strpos($suggestedFileName, '.'); @@ -231,8 +232,6 @@ class ObjectHelper { if (($contentSize = self::getDatastreamSize($pid, $dsID, TRUE)) > 0) { drupal_set_header("Content-Length: $contentSize"); - // Fixes an IE issue - drupal_set_header("Cache-Control: private", TRUE); } $opts = array( From 96694694795afe18b8dc04590cd98a3df91a3602 Mon Sep 17 00:00:00 2001 From: Jordan Dukart Date: Tue, 21 Aug 2012 15:45:07 -0300 Subject: [PATCH 2/2] Fixed merge conflict with IE download/handle resolving --- ObjectHelper.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/ObjectHelper.inc b/ObjectHelper.inc index f3735720..698e5d42 100644 --- a/ObjectHelper.inc +++ b/ObjectHelper.inc @@ -186,9 +186,6 @@ class ObjectHelper { if ($mimeType = $info['content_type']) { drupal_set_header("Content-Type: $mimeType"); - // Fixes an IE issue (ISLANDORA-311) - // http://support.microsoft.com/kb/316431 - drupal_set_header("Cache-Control: private", TRUE); if ($asAttachment) { $suggestedFileName = "$label"; $pos = strpos($suggestedFileName, '.');