diff options
| author | Derick Rethans <derick@php.net> | 2002-01-09 16:03:36 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2002-01-09 16:03:36 +0000 |
| commit | aee570302f7ec129ec83e675461a9fbd80efb22d (patch) | |
| tree | 680a36710a8576c59e3d1910e879fed5a6003d5b /ext/standard/array.c | |
| parent | 990c27a23a86182210c0576dfa670d4f41f95279 (diff) | |
| download | php-git-aee570302f7ec129ec83e675461a9fbd80efb22d.tar.gz | |
- Fix bug introduced in earlier patch
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 3ce6d17cc0..86331a75e8 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -260,11 +260,16 @@ PHP_FUNCTION(count) if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &array, &mode) == FAILURE) return; - if (Z_TYPE_P(array) == IS_ARRAY) { - RETURN_LONG (php_count_recursive (array, mode)); - } else { - /* return 1 for non-array arguments */ - RETURN_LONG(1); + switch (Z_TYPE_P(array)) { + case IS_NULL: + RETURN_LONG(0); + break; + case IS_ARRAY: + RETURN_LONG (php_count_recursive (array, mode)); + break; + default: + RETURN_LONG(1); + break; } } /* }}} */ |