diff options
| author | Stanislav Malyshev <stas@php.net> | 2011-12-26 05:01:46 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2011-12-26 05:01:46 +0000 |
| commit | 63e5f97da40470c00c1b53f95a163076184619ff (patch) | |
| tree | d38c8023394b38cf9f688f9e225e057034bc1faf /main/output.c | |
| parent | 15210d561aec12fdba4820f1b9d4d1f182fe66dd (diff) | |
| download | php-git-63e5f97da40470c00c1b53f95a163076184619ff.tar.gz | |
fix bug #60322 (ob_get_clean() now raises an E_NOTICE if no buffers exist)
Diffstat (limited to 'main/output.c')
| -rw-r--r-- | main/output.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/output.c b/main/output.c index 2ee34f59a4..b42809fcbc 100644 --- a/main/output.c +++ b/main/output.c @@ -1360,6 +1360,10 @@ PHP_FUNCTION(ob_get_clean) return; } + if(!OG(active)) { + RETURN_FALSE; + } + if (php_output_get_contents(return_value TSRMLS_CC) == FAILURE) { php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to delete buffer. No buffer to delete"); RETURN_FALSE; |