diff options
| author | Marcus Boerger <helly@php.net> | 2003-08-29 23:30:03 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2003-08-29 23:30:03 +0000 |
| commit | c3f7ea35105d7f2beb96e3fc853a71f0fdbbe3ed (patch) | |
| tree | 7e986dd6e2f30bc5f955840882edc3c81ee7492d /ext/sqlite/sqlite.c | |
| parent | 047a574e6c930ff4c451031843687d89305ce8c4 (diff) | |
| download | php-git-c3f7ea35105d7f2beb96e3fc853a71f0fdbbe3ed.tar.gz | |
Fix property inheritance by using dedicated new function
Diffstat (limited to 'ext/sqlite/sqlite.c')
| -rw-r--r-- | ext/sqlite/sqlite.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c index bac61c2ded..5b1eb922d9 100644 --- a/ext/sqlite/sqlite.c +++ b/ext/sqlite/sqlite.c @@ -1714,7 +1714,8 @@ PHP_FUNCTION(sqlite_fetch_object) 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 */ |