Skip to content

Commit beda509

Browse files
committed
1 parent f07e37c commit beda509

File tree

3 files changed

+1
-23
lines changed

3 files changed

+1
-23
lines changed

NEWS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ PHP NEWS
88
UNIX sockets). (Mike)
99
. Fixed bug #66182 (exit in stream filter produces segfault). (Mike)
1010
. Fixed bug #66736 (fpassthru broken). (Mike)
11-
. Fixed bug #67064 (Countable interface prevents using 2nd parameter
12-
($mode) of count() function). (Bob)
1311

1412
- Embed:
1513
. Fixed bug #65715 (php5embed.lib isn't provided anymore). (Anatol)

ext/standard/array.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,7 @@ PHP_FUNCTION(count)
333333
#ifdef HAVE_SPL
334334
/* if not and the object implements Countable we call its count() method */
335335
if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {
336-
zval *mode_zv;
337-
MAKE_STD_ZVAL(mode_zv);
338-
Z_LVAL_P(mode_zv) = mode;
339-
zend_call_method_with_1_params(&array, NULL, NULL, "count", &retval, mode_zv);
336+
zend_call_method_with_0_params(&array, NULL, NULL, "count", &retval);
340337
if (retval) {
341338
convert_to_long_ex(&retval);
342339
RETVAL_LONG(Z_LVAL_P(retval));

ext/standard/tests/array/bug67064.phpt

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)