From: Georg Richter <georg@php.net>
Date: Mon, 26 Jul 2004 07:22:01 +0000 (+0000)
Subject: MFH: fixed bug 29335
X-Git-Tag: php-5.0.1RC1~72
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b10ad424a82b492e39c841516b4e2066f0f2c0c;p=php

MFH: fixed bug 29335
---

diff --git a/NEWS b/NEWS
index 29a8105df7..6beedd9682 100644
--- 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 684e622ae8..d9ef90dd43 100644
--- 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;
 			}