summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Richter <georg@php.net>2004-07-26 07:19:05 +0000
committerGeorg Richter <georg@php.net>2004-07-26 07:19:05 +0000
commit485f862b350b892c164c0f0a962b4231a07dec90 (patch)
tree738d76ad349bca84f9254c402d33b5de30729075
parente64af9a898c7bc15a469c124486b923254ecc51c (diff)
downloadphp-git-485f862b350b892c164c0f0a962b4231a07dec90.tar.gz
fixed bug #29335
-rw-r--r--NEWS1
-rw-r--r--ext/mysqli/mysqli.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index b41d72d6e7..72f3b415ab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2004, PHP 5.1.0
+- Fixed bug #29335 (fetch functions now use MYSQLI_BOTH as default) (Georg)
- Fixed bug #29311 (calling parent constructor in mysqli). (Georg)
- Fixed bug #29236 (memory error when wsdl-cache is enabled). (Dmitry)
- Fixed bug #29109 (SoapFault exception: [WSDL] Out of memory). (Dmitry)
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index b02effb7f9..a51338ad33 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -602,7 +602,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
}
fetchtype = override_flags;
} else {
- fetchtype = MYSQLI_NUM;
+ fetchtype = MYSQLI_ASSOC;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|l", &mysql_result, mysqli_result_class_entry, &fetchtype) == FAILURE) {
return;
}