TCPDF: merge conflict fixed

phpmyadmin · Aug 17, 2010 · b95a14c · b95a14c
1 parent 224abba
commit b95a14c
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/libraries/tcpdf/tcpdf.php b/libraries/tcpdf/tcpdf.php
@@ -2980,8 +2980,7 @@ public function Output($name='',$dest='') {
 					if(ob_get_contents()) {
 						$this->Error('Some data has already been output, can\'t send PDF file');
 					}
-					//ob_end_clean();
-					//ob_start();
+
 					if(php_sapi_name()!='cli') {
 						//We send to a browser
 						header('Content-Type: application/pdf');
@@ -2996,18 +2995,10 @@ public function Output($name='',$dest='') {
 				}
 				case 'D': {
 					//Download file
-<<<<<<< HEAD
 					if(ob_get_contents()) {
 						$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')) {
 						header('Content-Type: application/force-download');
 					} else {