cvs: php4 /ext/mysql php_mysql.c
| From: | Andi Gutmans | Date: | Sat, 11 Aug 2001 18:27:49 +0000 |
| Subject: | cvs: php4 /ext/mysql php_mysql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6743@lists.php.net to get a copy of this message | ||
andi Sat Aug 11 14:27:49 2001 EDT
Modified files:
/php4/ext/mysql php_mysql.c
Log:
- Make mysql_fetch_object() work w/ Engine 2
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.96 php4/ext/mysql/php_mysql.c:1.97
--- php4/ext/mysql/php_mysql.c:1.96 Sat Aug 11 12:39:03 2001
+++ php4/ext/mysql/php_mysql.c Sat Aug 11 14:27:48 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.96 2001/08/11 16:39:03 zeev Exp $ */
+/* $Id: php_mysql.c,v 1.97 2001/08/11 18:27:48 andi Exp $ */
/* TODO:
@@ -1612,10 +1612,7 @@
php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQL_ASSOC, 2);
if (Z_TYPE_P(return_value) == IS_ARRAY) {
- /* OBJECTS_FIXME: Fix this for new object model */
- Z_TYPE_P(return_value) = IS_OBJECT;
- Z_OBJPROP_P(return_value) = return_value->value.ht;
- Z_OBJCE_P(return_value) = &zend_standard_class_def;
+ object_and_properties_init(return_value, &zend_standard_class_def,
return_value->value.ht);
}
}
/* }}} */