johannes Fri Jan 9 14:30:01 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqli mysqli_api.c /php-src NEWS Log: MFH: Fixed bug #46653 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.22&r2=1.118.2.22.2.16.2.23&diff_format=u Index: php-src/ext/mysqli/mysqli_api.c diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.22 php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.23 --- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.22 Wed Dec 31 11:15:39 2008 +++ php-src/ext/mysqli/mysqli_api.c Fri Jan 9 14:30:00 2009 @@ -17,7 +17,7 @@ | Ulf Wendel <u...@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_api.c,v 1.118.2.22.2.16.2.22 2008/12/31 11:15:39 sebastian Exp $ + $Id: mysqli_api.c,v 1.118.2.22.2.16.2.23 2009/01/09 14:30:00 johannes Exp $ */ #ifdef HAVE_CONFIG_H @@ -1313,7 +1313,7 @@ MYSQLI_RESOURCE *mysqli_resource; MY_MYSQL *mysql; - if (getThis() && instanceof_function(Z_OBJCE_P(getThis()), mysqli_link_class_entry TSRMLS_CC)) { + if (getThis() && ((mysqli_object *) zend_object_store_get_object(getThis() TSRMLS_CC))->ptr) { return; } http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.438&r2=1.2027.2.547.2.965.2.439&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.438 php-src/NEWS:1.2027.2.547.2.965.2.439 --- php-src/NEWS:1.2027.2.547.2.965.2.438 Wed Jan 7 22:12:39 2009 +++ php-src/NEWS Fri Jan 9 14:30:00 2009 @@ -38,6 +38,7 @@ given bad data). (Ilia) - Fixed bug #46738 (Segfault when mb_detect_encoding() fails). (Scott) - Fixed bug #46681 (mkdir() fails silently on PHP 5.3). (Hannes) +- Fixed bug #46653 (can't extend mysqli). (Johannes) - Fixed bug #46646 (Restrict serialization on some internal classes like Closure and SplFileInfo using exceptions). (Etienne) - Fixed bug #46268 (DateTime::modify() does not reset relative time values).
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php