andrei Sat Jul 22 16:58:07 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard array.c
Log:
Matt should be happy now.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.5&r2=1.308.2.21.2.6&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.5
php-src/ext/standard/array.c:1.308.2.21.2.6
--- php-src/ext/standard/array.c:1.308.2.21.2.5 Fri Jul 21 23:54:19 2006
+++ php-src/ext/standard/array.c Sat Jul 22 16:58:06 2006
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.21.2.5 2006/07/21 23:54:19 andrei Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.6 2006/07/22 16:58:06 andrei Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -4522,7 +4522,7 @@
/* }}} */
/* {{{ 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 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
