Fixed bug #60321 (ob_get_status(true) no longer returns an array when…

… buffer is empty).
jbondc · Nov 18, 2011 · 52ca904 · 52ca904
1 parent 2ba9ff7
commit 52ca904
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/main/output.c b/main/output.c
@@ -1438,13 +1438,13 @@ PHP_FUNCTION(ob_get_status)
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &full_status) == FAILURE) {
 		return;
 	}
+
+	array_init(return_value);
 
 	if (!OG(active)) {
-		RETURN_FALSE;
+		return;
 	}
 
-	array_init(return_value);
-
 	if (full_status) {
 		zend_stack_apply_with_argument(&OG(handlers), ZEND_STACK_APPLY_BOTTOMUP, php_output_stack_apply_status, return_value);
 	} else {

diff --git a/tests/output/bug60321.phpt b/tests/output/bug60321.phpt
@@ -0,0 +1,9 @@
+--TEST--
+Bug #60321 (ob_get_status(true) no longer returns an array when buffer is empty)
+--FILE--
+<?php
+$return = ob_get_status(true);                                                  
+var_dump($return);
+--EXPECT--
+array(0) {
+}