parsecsv/parsecsv-for-php
1
0
Fork 0
mirror of https://github.com/parsecsv/parsecsv-for-php.git synced 2026-02-19 08:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
William Knauss
2014-06-02 20:34:08 -04:00
parent c64a4bffd7 7b6692d7fd
commit 73d7acb493
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
parsecsv.lib.php
View File

@@ -459,7 +459,16 @@ class parseCSV {
if ( $filename !== null ) { if ( $filename !== null ) {
header('Content-type: application/csv'); header('Content-type: application/csv');
<<<<<<< HEAD
header('Content-Disposition: attachment; filename="'.$filename.'"'); header('Content-Disposition: attachment; filename="'.$filename.'"');
=======
header('Content-Length: '.strlen($data));
header('Cache-Control: no-cache, must-revalidate');
header('Pragma: no-cache');
header('Expires: 0');
header('Content-Disposition: attachment; filename="'.$filename.'"; modification-date="'.date('r').'";');
>>>>>>> 7b6692d7fd7a9c09d9919c26380a1aa9fef3a6d7
echo $data; echo $data;
} }