diff options
| -rw-r--r-- | ext/imap/php_imap.c | 4 | ||||
| -rw-r--r-- | ext/mcal/php_mcal.c | 2 | ||||
| -rw-r--r-- | ext/msql/php_msql.c | 4 | ||||
| -rw-r--r-- | ext/mssql/php_mssql.c | 4 | ||||
| -rw-r--r-- | ext/odbc/php_odbc.c | 1 | ||||
| -rw-r--r-- | ext/pgsql/pgsql.c | 4 |
6 files changed, 6 insertions, 13 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 2c4afdf5a0..10a820c4a1 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -244,7 +244,7 @@ static int add_assoc_object(zval *arg, char *key, zval *tmp) HashTable *symtable; if (arg->type == IS_OBJECT) { - symtable = arg->value.obj.properties; + symtable = Z_OBJPROP_P(arg); } else { symtable = arg->value.ht; } @@ -259,7 +259,7 @@ static inline int add_next_index_object(zval *arg, zval *tmp) HashTable *symtable; if (arg->type == IS_OBJECT) { - symtable = arg->value.obj.properties; + symtable = Z_OBJPROP_P(arg); } else { symtable = arg->value.ht; } diff --git a/ext/mcal/php_mcal.c b/ext/mcal/php_mcal.c index 9ae8422d88..d7a3f083a3 100644 --- a/ext/mcal/php_mcal.c +++ b/ext/mcal/php_mcal.c @@ -203,7 +203,7 @@ static int add_assoc_object(zval *arg, char *key, zval *tmp) HashTable *symtable; if (arg->type == IS_OBJECT) { - symtable = arg->value.obj.properties; + symtable = Z_OBJPROP_P(arg); } else { symtable = arg->value.ht; } diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c index a4441c6823..66639cb1a1 100644 --- a/ext/msql/php_msql.c +++ b/ext/msql/php_msql.c @@ -982,9 +982,7 @@ PHP_FUNCTION(msql_fetch_object) { php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); 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; + object_and_properties_init(return_value, &zend_standard_class_def, return_value->value.ht); } } /* }}} */ diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index f10dfadaa6..995bc157b1 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -1226,9 +1226,7 @@ PHP_FUNCTION(mssql_fetch_object) { php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC); 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; + object_and_properties_init(return_value, &zend_standard_class_def, return_value->value.ht); } } diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 14dc9093a1..4fdde9db5f 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -1337,7 +1337,6 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) Fetch a result row as an object */ 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) { object_and_properties_init(return_value, &zend_standard_class_def, return_value->value.ht); diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index fcf9271ab1..4c2521d453 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -1252,9 +1252,7 @@ PHP_FUNCTION(pg_fetch_object) { php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); 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; + object_and_properties_init(return_value, &zend_standard_class_def, return_value->value.ht); } } /* }}} */ |