From: Andrei Zmievski <andrei@php.net>
Date: Sat, 22 Jul 2006 16:58:06 +0000 (+0000)
Subject: Matt should be happy now.
X-Git-Tag: php-5.2.0RC1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d827c763792253d3dbd9005c6a7878db33517f9b;p=php

Matt should be happy now.
---

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);