Merge pull request #5261 from sadapon2008/2.x-response-ob_flush

an unnecessary E_NOTICE caused by CakeResponse::download()
cakephp · Nov 26, 2014 · ac02350 · ac02350
2 parents 5a9bef2 + 1f4402c
commit ac02350
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php
@@ -1507,7 +1507,9 @@ protected function _clearBuffer() {
 	protected function _flushBuffer() {
 		//@codingStandardsIgnoreStart
 		@flush();
-		@ob_flush();
+		if (ob_get_level()) {
+			@ob_flush();
+		}
 		//@codingStandardsIgnoreEnd
 	}