Peter M. Groen / knowledgetree

Commit 2a345ca849a4f9d62fab09e9125740796209b4b4

Authored by Kevin Fourie
1 parent ef369e86

Merged in from STABLE trunk... 

KTS-2147
"Cannot download or checkout files using Internet Explorer (IE)"
Fixed.
// HTTP/1.0
header("Pragma: no-cache");
This breaks IE7 in SSL mode. A bit of searching shows it's recommended to not send this header.
We do cache control with HTTP/1.1 headers anyway.

Committed By: Kevin
Reviewed By: Conrad

KTS-2110
"When not having a PDF reader or similar installed the 'Generate PDF' functionality converts the file to a php format."
Fixed.

Committed By: Kevin
Reviewed By: Conrad

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6886 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
lib/storage/ondiskhashedstoragemanager.inc.php
  View file @2a345ca
@@ -157,11 +157,11 @@ class KTOnDiskHashedStorageManager extends KTStorageManager { @@ -157,11 +157,11 @@ class KTOnDiskHashedStorageManager extends KTStorageManager {
157 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); 157 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
158 header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); 158 header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
159 // HTTP/1.1 159 // HTTP/1.1
160 - header("Cache-Control: no-store, no-cache, must-revalidate");  
161 - header("Cache-Control: post-check=0, pre-check=0", false); 160 + header("Cache-Control: no-store, no-cache, must-revalidate");
  161 + header("Cache-Control: post-check=0, pre-check=0", false);
162 162
163 - // HTTP/1.0  
164 - header("Pragma: no-cache"); 163 + // HTTP/1.0
  164 + // header("Pragma: no-cache"); // Don't send this header! It breaks IE.
165 165
166 $oFile = new KTFSFileLike($sPath); 166 $oFile = new KTFSFileLike($sPath);
167 KTFileLikeUtil::send_contents($oFile); 167 KTFileLikeUtil::send_contents($oFile);
plugins/ktstandard/PDFGeneratorAction.php
  View file @2a345ca
@@ -223,7 +223,7 @@ class PDFGeneratorAction extends KTDocumentAction { @@ -223,7 +223,7 @@ class PDFGeneratorAction extends KTDocumentAction {
223 header("Cache-Control: post-check=0, pre-check=0", false); 223 header("Cache-Control: post-check=0, pre-check=0", false);
224 224
225 // HTTP/1.0 225 // HTTP/1.0
226 - header("Pragma: no-cache"); 226 + // header("Pragma: no-cache"); // Don't send this header! It breaks IE.
227 227
228 // Get a filelike object and send it to the browser 228 // Get a filelike object and send it to the browser
229 $oFile = new KTFSFileLike($sTempFilename); 229 $oFile = new KTFSFileLike($sTempFilename);