nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TCPDF: merge conflict fixed

Browse Source
This commit is contained in:
Adnan
2010-08-17 22:26:15 +05:00
parent 224abbaf5e
commit b95a14c0de
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/tcpdf/tcpdf.php
View File

@@ -2980,8 +2980,7 @@ if(!class_exists('TCPDF', false)) {
if(ob_get_contents()) { if(ob_get_contents()) {
$this->Error('Some data has already been output, can\'t send PDF file'); $this->Error('Some data has already been output, can\'t send PDF file');
} }
//ob_end_clean();
//ob_start();
if(php_sapi_name()!='cli') { if(php_sapi_name()!='cli') {
//We send to a browser //We send to a browser
header('Content-Type: application/pdf'); header('Content-Type: application/pdf');
@@ -2996,18 +2995,10 @@ if(!class_exists('TCPDF', false)) {
} }
case 'D': { case 'D': {
//Download file //Download file
<<<<<<< HEAD
if(ob_get_contents()) { if(ob_get_contents()) {
$this->Error(ob_get_contents().'Some data has already been output, can\'t send PDF file'); $this->Error(ob_get_contents().'Some data has already been output, can\'t send PDF file');
} }
//ob_end_clean();
//ob_start();
=======
// if(ob_get_contents()) {
// $this->Error(ob_get_contents().'Some data has already been output, can\'t send PDF file');
//}
>>>>>>> 14b26e3... TCPDF Class: Clean output buffer before downloading file
if(isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')) { if(isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')) {
header('Content-Type: application/force-download'); header('Content-Type: application/force-download');
} else { } else {