- Make odbc_fetch_object() work with Engine 2

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index e5ee7257eb4ab915873b06342eeca9ea8e11bf29..ab0638ed10b6b809fb4c94e908ad23a5dabbfc7e 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -1336,9 +1336,7 @@ PHP_FUNCTION(odbc_fetch_object)
        /* OBJECTS_FIXME */
        php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT);
        if (Z_TYPE_P(return_value) == IS_ARRAY) {
-               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);
        }
 }
 /* }}} */