From 8e2dcfd8b603e452781269158b735c12965e97fb Mon Sep 17 00:00:00 2001
From: Pierrick Charron <pierrick@php.net>
Date: Fri, 18 Nov 2011 00:16:58 +0000
Subject: [PATCH] Fixed bug #60321 (ob_get_status(true) no longer returns an
 array when buffer is empty).

---
 NEWS                       | 2 ++
 main/output.c              | 6 +++---
 tests/output/bug60321.phpt | 9 +++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 tests/output/bug60321.phpt

diff --git a/NEWS b/NEWS
index 74d1ce1c72..717cb7137d 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,8 @@ PHP                                                                        NEWS
     (Chris Jones)
 
 - Output:
+  . Fixed bug #60321 (ob_get_status(true) no longer returns an array when 
+    buffer is empty). (Pierrick)
   . Fixed bug #60282 (Segfault when using ob_gzhandler() with open buffers).
     (Laruence)
     
diff --git a/main/output.c b/main/output.c
index 6a8f79a727..3b06d7471a 100644
--- a/main/output.c
+++ b/main/output.c
@@ -1439,12 +1439,12 @@ PHP_FUNCTION(ob_get_status)
 		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) {
+}
-- 
2.50.1