diff options
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index dc46c888cc..d1c47e7ded 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -1619,10 +1619,12 @@ PHP_FUNCTION(mysql_fetch_row) PHP_FUNCTION(mysql_fetch_object) { php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQL_ASSOC, 2); - if (return_value->type==IS_ARRAY) { - return_value->type=IS_OBJECT; - return_value->value.obj.properties = return_value->value.ht; - return_value->value.obj.ce = &zend_standard_class_def; + + 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; } } /* }}} */ |