]> granicus.if.org Git - php/commitdiff
Fix property inheritance by using dedicated new function
authorMarcus Boerger <helly@php.net>
Fri, 29 Aug 2003 23:30:03 +0000 (23:30 +0000)
committerMarcus Boerger <helly@php.net>
Fri, 29 Aug 2003 23:30:03 +0000 (23:30 +0000)
ext/sqlite/sqlite.c

index bac61c2ded851ae772f3b2a81bf5206fd8610ef4..5b1eb922d900b8809349b265d7ce1267a1ddc059 100644 (file)
@@ -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 */