helly Fri Aug 29 19:30:05 2003 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Fix property inheritance by using dedicated new function
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.89 php-src/ext/sqlite/sqlite.c:1.90
--- php-src/ext/sqlite/sqlite.c:1.89 Fri Aug 29 17:33:24 2003
+++ php-src/ext/sqlite/sqlite.c Fri Aug 29 19:30:03 2003
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.89 2003/08/29 21:33:24 helly Exp $
+ $Id: sqlite.c,v 1.90 2003/08/29 23:30:03 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -941,7 +941,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.89 2003/08/29 21:33:24 helly Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.90 2003/08/29 23:30:03 helly Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
@@ -1714,7 +1714,8 @@
php_sqlite_fetch_array(res, PHPSQLITE_ASSOC, decode_binary, 1, &dataset
TSRMLS_CC);
- object_and_properties_init(return_value, ce, Z_ARRVAL(dataset));
+ object_and_properties_init(return_value, ce, NULL);
+ zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 TSRMLS_CC);
php_std_error_handling(); /* before calling the ctor */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
