Revert "Fix bug #67064 in a BC safe way"

bwoebi · bwoebi · commit 354ee12b73db · 2014-07-30T17:18:05.000+02:00
This reverts commit 1a4a9ee. Conflicts: ext/standard/array.c ext/standard/tests/array/bug67064.phpt
diff --git a/NEWS b/NEWS
@@ -3,7 +3,10 @@ PHP                                                                        NEWS
 ?? ??? 2014, PHP 5.6.0 Release Candidate 4
 
 - Core:
-  . Fixed bug #67693 (incorrect push to the empty array) (Tjerk)
+  . Fixed bug #67693 (incorrect push to the empty array). (Tjerk)
+
+ - SPL:
+  . Revert fix for bug #67064 (BC issues). (Bob)
 
 31 Jul 2014, PHP 5.6.0 Release Candidate 3
 
diff --git a/ext/standard/array.c b/ext/standard/array.c
@@ -333,10 +333,7 @@ PHP_FUNCTION(count)
 #ifdef HAVE_SPL
 			/* if not and the object implements Countable we call its count() method */
 			if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {
-				zval *mode_zv;
-				MAKE_STD_ZVAL(mode_zv);
-				ZVAL_LONG(mode_zv, mode);
-				zend_call_method_with_1_params(&array, NULL, NULL, "count", &retval, mode_zv);
+				zend_call_method_with_0_params(&array, NULL, NULL, "count", &retval);
 				if (retval) {
 					convert_to_long_ex(&retval);
 					RETVAL_LONG(Z_LVAL_P(retval));
diff --git a/ext/standard/tests/array/bug67064.phpt b/ext/standard/tests/array/bug67064.phpt
