diff options
| author | Ben Ramsey <ramsey@php.net> | 2012-04-15 21:40:45 -0500 |
|---|---|---|
| committer | Ben Ramsey <ramsey@php.net> | 2013-01-11 14:16:19 -0600 |
| commit | 20ab30339d9731dd6e85ea5029280148f519cdc7 (patch) | |
| tree | 9e48ee731dac10e06825875aeae6208d3cc357af /ext/standard/array.c | |
| parent | 66a02eb25e1533c2ace47f8d934b193ebe317cde (diff) | |
| download | php-git-20ab30339d9731dd6e85ea5029280148f519cdc7.tar.gz | |
array_column: Adding test for IS_OBJECT and converting object to string
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 40ee947fa5..00850ba49a 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2589,6 +2589,11 @@ PHP_FUNCTION(array_column) key = Z_STRVAL_P(zoffset); key_len = Z_STRLEN_P(zoffset); break; + case IS_OBJECT: + convert_to_string_ex(&zoffset); + key = Z_STRVAL_P(zoffset); + key_len = Z_STRLEN_P(zoffset); + break; default: php_error_docref(NULL TSRMLS_CC, E_WARNING, "The key should be either a string or an integer"); RETURN_FALSE; |