- Make mysql_fetch_object() work w/ Engine 2

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 710d7c7459e43837d161a2fda8232aca715d0346..f1aab4eed9cb8028f2fd37528c9361059b7b9ef7 100644 (file)
--- 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);
        }
 }
 /* }}} */