diff options
| author | Andrei Zmievski <andrei@php.net> | 2006-07-22 16:58:06 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2006-07-22 16:58:06 +0000 |
| commit | d827c763792253d3dbd9005c6a7878db33517f9b (patch) | |
| tree | 492a1f339b75486db69162619610ac05be89e408 /ext/standard/array.c | |
| parent | cfac29e20eb286ef4d083338e446dd0cb56af1d2 (diff) | |
| download | php-git-d827c763792253d3dbd9005c6a7878db33517f9b.tar.gz | |
Matt should be happy now.
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index b7c750b0f7..8ed13562fe 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -4522,7 +4522,7 @@ PHP_FUNCTION(array_chunk) /* }}} */ /* {{{ proto array array_combine(array keys, array values) - Creates an array by using the elements of the first parameter as keys and the elements of the second as corresponding keys */ + Creates an array by using the elements of the first parameter as keys and the elements of the second as the corresponding keys */ PHP_FUNCTION(array_combine) { zval *values, *keys; @@ -4551,7 +4551,7 @@ PHP_FUNCTION(array_combine) zend_hash_get_current_data_ex(Z_ARRVAL_P(values), (void **)&entry_values, &pos_values) == SUCCESS) { if (Z_TYPE_PP(entry_keys) == IS_STRING) { zval_add_ref(entry_values); - add_assoc_zval(return_value, Z_STRVAL_PP(entry_keys), *entry_values); + add_assoc_zval_ex(return_value, Z_STRVAL_PP(entry_keys), Z_STRLEN_PP(entry_keys), *entry_values); } else if (Z_TYPE_PP(entry_keys) == IS_LONG) { zval_add_ref(entry_values); add_index_zval(return_value, Z_LVAL_PP(entry_keys), *entry_values); |