cvs: php4 /ext/odbc php_odbc.c
| From: | Andi Gutmans | Date: | Sat, 11 Aug 2001 18:28:31 +0000 |
| Subject: | cvs: php4 /ext/odbc php_odbc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6744@lists.php.net to get a copy of this message | ||
andi Sat Aug 11 14:28:31 2001 EDT
Modified files:
/php4/ext/odbc php_odbc.c
Log:
- Make odbc_fetch_object() work with Engine 2
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.103 php4/ext/odbc/php_odbc.c:1.104
--- php4/ext/odbc/php_odbc.c:1.103 Sun Aug 5 11:55:41 2001
+++ php4/ext/odbc/php_odbc.c Sat Aug 11 14:28:31 2001
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.103 2001/08/05 15:55:41 sas Exp $ */
+/* $Id: php_odbc.c,v 1.104 2001/08/11 18:28:31 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1336,9 +1336,7 @@
/* 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);
}
}
/* }}} */