Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

MFH: Fixed bug #46653

  • Loading branch information...
commit 7d3d47fa272f291f7522581d814ece245b5df597 1 parent 49a6cc2
Johannes Schlüter johannes authored

Showing 2 changed files with 2 additions and 1 deletion. Show diff stats Hide diff stats

  1. +1 0  NEWS
  2. +1 1  ext/mysqli/mysqli_api.c
1  NEWS
@@ -38,6 +38,7 @@ PHP NEWS
38 38 given bad data). (Ilia)
39 39 - Fixed bug #46738 (Segfault when mb_detect_encoding() fails). (Scott)
40 40 - Fixed bug #46681 (mkdir() fails silently on PHP 5.3). (Hannes)
  41 +- Fixed bug #46653 (can't extend mysqli). (Johannes)
41 42 - Fixed bug #46646 (Restrict serialization on some internal classes like
42 43 Closure and SplFileInfo using exceptions). (Etienne)
43 44 - Fixed bug #46268 (DateTime::modify() does not reset relative time values).
2  ext/mysqli/mysqli_api.c
@@ -1313,7 +1313,7 @@ PHP_FUNCTION(mysqli_init)
1313 1313 MYSQLI_RESOURCE *mysqli_resource;
1314 1314 MY_MYSQL *mysql;
1315 1315
1316   - if (getThis() && instanceof_function(Z_OBJCE_P(getThis()), mysqli_link_class_entry TSRMLS_CC)) {
  1316 + if (getThis() && ((mysqli_object *) zend_object_store_get_object(getThis() TSRMLS_CC))->ptr) {
1317 1317 return;
1318 1318 }
1319 1319

0 comments on commit 7d3d47f

Please sign in to comment.
Something went wrong with that request. Please try again.