Index: ext/standard/array.c
===================================================================
RCS file: /repository/php-src/ext/standard/array.c,v
retrieving revision 1.372
diff -u -r1.372 array.c
--- ext/standard/array.c	21 Jul 2006 07:34:18 -0000	1.372
+++ ext/standard/array.c	21 Jul 2006 11:38:05 -0000
@@ -4479,7 +4479,7 @@
 /* }}} */
 
 /* {{{ proto array array_combine(array keys, array values) U
-   Creates an array by using the elements of the first parameter as keys and the elements of the second as the correspoding values */
+   Creates an array by using the elements of the first parameter as keys and the elements of the second as the corresponding values */
 PHP_FUNCTION(array_combine)
 {
 	zval *values, *keys;
@@ -4495,7 +4495,7 @@
 	num_values = zend_hash_num_elements(Z_ARRVAL_P(values));
 
 	if (num_keys != num_values) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Both parameters should have equal number of elements");
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Both parameters should have an equal number of elements");
 		RETURN_FALSE;
 	}
 
@@ -4527,7 +4527,7 @@
 			}
 
 			zval_add_ref(entry_values);
-			add_u_assoc_zval(return_value, Z_TYPE_P(key_ptr), Z_UNIVAL_P(key_ptr), *entry_values);
+			add_u_assoc_zval_ex(return_value, Z_TYPE_P(key_ptr), Z_UNIVAL_P(key_ptr), Z_UNILEN_P(key_ptr) + 1, *entry_values);
 
 			if (key_ptr != *entry_keys) {
 				zval_dtor(&key);