BUG: refs #0324. Fix occasional hanging during upload

zachmullen · zachmullen · commit 44997dc9e154 · 2011-11-02T11:47:25.000-04:00
diff --git a/core/controllers/UploadController.php b/core/controllers/UploadController.php
@@ -252,11 +252,13 @@ public function saveuploadedAction()
       }
     else
       {
+      ob_start();
       $upload = new Zend_File_Transfer();
       $upload->receive();
       $path = $upload->getFileName();
       $file_size =  filesize($path);
       $filename = $upload->getFilename(null, false);
+      ob_end_clean();
       }
 
     $parent = $this->_getParam("parent");

Original file line number	Diff line number	Diff line change
`@@ -252,11 +252,13 @@ public function saveuploadedAction()`
`252`	`252`	`}`
`253`	`253`	`else`
`254`	`254`	`{`
	`255`	`+ ob_start();`
`255`	`256`	`$upload = new Zend_File_Transfer();`
`256`	`257`	`$upload->receive();`
`257`	`258`	`$path = $upload->getFileName();`
`258`	`259`	`$file_size = filesize($path);`
`259`	`260`	`$filename = $upload->getFilename(null, false);`
	`261`	`+ ob_end_clean();`
`260`	`262`	`}`
`261`	`263`
`262`	`264`	`$parent = $this->_getParam("parent");`