MFH: fixed bug 29335

diff --git a/NEWS b/NEWS
index 29a8105df7ba4172b220661788a709c2db8e327e..6beedd96821113c44e99f5b9fbbf32ee5a2765f6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ PHP                                                                        NEWS
   (Marcus, kameshj at fastmail dot fm)
 - Fixed bug #29368 (The destructor is called when an exception is thrown from 
   the constructor). (Marcus)
+- Fixed bug #29335 (fetch functions now use MYSQLI_BOTH as default) (Georg)
 - Fixed bug #29291 (get_class_vars() return names with NULLs). (Marcus)
 - Fixed bug #29119 (html_entity_decode() misbehaves with UTF-8). (Moriyoshi)
 - Fixed bug #28895 (ReflectionClass::isAbstract always returns false). (Marcus)

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 684e622ae8c111b17b57a58011e6687f88e8a6fc..d9ef90dd439fbe2b26b38cd38038e43345fa01e5 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -594,7 +594,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;
                        }