fixed bug #29335

diff --git a/NEWS b/NEWS
index b41d72d6e7c86efa290153cb889878cc72cab24e..72f3b415abb24c14e7b17c3df86264aa31481a4d 100644 (file)
--- 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 b02effb7f98f1fe5c330600633a668cbe2c599db..a51338ad338a361fbdd1f6075753a06974cd40b1 100644 (file)
--- 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;
                        }