Merge pull request #6645 from igorpadovan/2.6

Preventing error when trying to delete unexisting buffer
This commit is contained in:
Mark Story 2015-05-26 20:16:01 -04:00
commit 0c9fea8523

View file

@ -1496,9 +1496,10 @@ class CakeResponse {
* @return bool
*/
protected function _clearBuffer() {
//@codingStandardsIgnoreStart
return @ob_end_clean();
//@codingStandardsIgnoreEnd
if (ob_get_length()) {
return ob_end_clean();
}
return true;
}
/**