summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2001-08-11 18:27:48 +0000
committerAndi Gutmans <andi@php.net>2001-08-11 18:27:48 +0000
commited9c36c1b85776b6987a9a02cd8cfa04fdb8a0ac (patch)
treea34269d2781435a1ac38590ae74f56f831312850
parent76a7a5bc18deadd5d4aa4e9cc3fdd72bcd54b764 (diff)
downloadphp-git-ed9c36c1b85776b6987a9a02cd8cfa04fdb8a0ac.tar.gz
- Make mysql_fetch_object() work w/ Engine 2
-rw-r--r--ext/mysql/php_mysql.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 710d7c7459..f1aab4eed9 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1612,10 +1612,7 @@ PHP_FUNCTION(mysql_fetch_object)
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);
}
}
/* }}} */