From: Pierrick Charron <pierrick@php.net>
Date: Fri, 18 Nov 2011 00:16:58 +0000 (+0000)
Subject: Fixed bug #60321 (ob_get_status(true) no longer returns an array when buffer is empty).
X-Git-Tag: php-5.5.0alpha1~876
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52ca90428dffb8b998c701fa957934f31b306fab;p=php

Fixed bug #60321 (ob_get_status(true) no longer returns an array when buffer is empty).
---

diff --git a/main/output.c b/main/output.c
index 6a8f79a727..2ee34f59a4 100644
--- 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
new file mode 100644
index 0000000000..9802a57ccd
--- /dev/null
+++ 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) {
+}