diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2010-03-11 09:42:07 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2010-03-11 09:42:07 +0000 |
| commit | 08acf5c407242344b0047b8040900f52df620dde (patch) | |
| tree | 49936ec28d8b2a4256959f13245d757df97e04bd /lang/php53/files/patch-ext_standard_array.c | |
| parent | bdce4d94e267612e2955a9270d4659712a679dea (diff) | |
This commit was manufactured by cvs2svn to create tag 'RELEASE_7_3_0'.release/7.3.0
Diffstat (limited to 'lang/php53/files/patch-ext_standard_array.c')
| -rw-r--r-- | lang/php53/files/patch-ext_standard_array.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/lang/php53/files/patch-ext_standard_array.c b/lang/php53/files/patch-ext_standard_array.c deleted file mode 100644 index bd6d4d0c95d4..000000000000 --- a/lang/php53/files/patch-ext_standard_array.c +++ /dev/null @@ -1,33 +0,0 @@ ---- ext/standard/array.c.orig Mon Feb 12 20:20:48 2007 -+++ ext/standard/array.c Mon Feb 12 20:22:14 2007 -@@ -295,6 +295,7 @@ - PHP_FUNCTION(count) - { - zval *array; -+ zend_class_entry **ce_Countable; - long mode = COUNT_NORMAL; - - if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &array, &mode) == FAILURE) -@@ -308,11 +309,11 @@ - RETURN_LONG (php_count_recursive (array, mode TSRMLS_CC)); - break; - case IS_OBJECT: { --#ifdef HAVE_SPL - /* it the object implements Countable we call its count() method */ - zval *retval; - -- if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) { -+ if (zend_lookup_class_ex("Countable", 9, 0, &ce_Countable TSRMLS_CC) != FAILURE) { -+ if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), *ce_Countable TSRMLS_CC)) { - zend_call_method_with_0_params(&array, NULL, NULL, "count", &retval); - if (retval) { - convert_to_long(retval); -@@ -321,7 +322,7 @@ - } - return; - } --#endif -+ } - /* if not we return the number of properties (not taking visibility into account) */ - if (Z_OBJ_HT_P(array)->count_elements) { - RETVAL_LONG(1); |